Reworked AnnotationInfo patch.

Took a more ambitious swing based on input from martin. Eliminated
the external map and gave annotations a more useful inheritance
hierarchy. Eliminated AnnotationInfoBase and made LazyAnnotationInfo an
AnnotationInfo (just like LazyType is a Type.) Review by odersky.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 7dc9b25015..ef1bcdd739 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -905,10 +905,7 @@ abstract class ClassfileParser {
                 case None =>
                   throw new RuntimeException("Scala class file does not contain Scala annotation")
               }
-            debuglog("[class] << " + sym.fullName + (
-              if (sym.rawAnnotations.isEmpty) ""
-              else sym.rawAnnotations.mkString("(", ", ", ")"))
-            )
+            debuglog("[class] << " + sym.fullName + sym.annotationsString)
           }
           else
             in.skip(attrLen)