fixed #842, #945, #83, #996, #1016, + some perf...

fixed #842, #945, #83, #996, #1016, + some performace tuning.

1 files changed, 23 insertions, 21 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index ce98eac3ff..4da75b3e4f 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -707,29 +707,31 @@ abstract class ClassfileParser {
     }
 
     /** Parse and return a single annotation.  If it is malformed,
-     *  throw an exception.  If it contains a nested annotation,
-     *  return None.
+     *  or it contains a nested annotation, return None.
      */
-    def parseAnnotation(attrNameIndex: Char): Option[AnnotationInfo] = {
-      val attrType = pool.getType(attrNameIndex)
-      val nargs = in.nextChar
-      val nvpairs = new ListBuffer[(Name,AnnotationArgument)]
-      var nestedAnnot = false  // if a nested annotation is seen,
-                               // then skip this annotation
-      for (i <- 0 until nargs) {
-        val name = pool.getName(in.nextChar)
-	val argConst = parseTaggedConstant
-	if (argConst.tag == AnnotationTag)
-	  nestedAnnot = true
-	else
-          nvpairs += ((name, new AnnotationArgument(argConst)))
-      }
+    def parseAnnotation(attrNameIndex: Char): Option[AnnotationInfo] =
+      try {
+        val attrType = pool.getType(attrNameIndex)
+        val nargs = in.nextChar
+        val nvpairs = new ListBuffer[(Name,AnnotationArgument)]
+        var nestedAnnot = false  // if a nested annotation is seen,
+                                 // then skip this annotation
+        for (i <- 0 until nargs) {
+          val name = pool.getName(in.nextChar)
+          val argConst = parseTaggedConstant
+          if (argConst.tag == AnnotationTag)
+            nestedAnnot = true
+          else
+            nvpairs += ((name, new AnnotationArgument(argConst)))
+        }
 
-      if (nestedAnnot)
-	None
-      else
-	Some(AnnotationInfo(attrType, List(), nvpairs.toList))
-    }
+        if (nestedAnnot)
+          None
+        else
+          Some(AnnotationInfo(attrType, List(), nvpairs.toList))
+      } catch {
+        case ex: Throwable => None // ignore malformed annotations ==> t1135
+      }
 
     /** Parse a sequence of annotations and attach them to the
      *  current symbol sym.