From 5083559781208d1b8805ab8f5cb773a225436526 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Fri, 25 Mar 2011 21:13:52 +0000 Subject: Figured out why -Ydebug has been such a deathtr... Figured out why -Ydebug has been such a deathtrap for a while. I'm the culprit. Making -Ydebug less likely to kill a compile, no review. --- src/compiler/scala/tools/nsc/symtab/Symbols.scala | 1 + src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index d7f9063ec6..c558610535 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -59,6 +59,7 @@ trait Symbols extends reflect.generic.Symbols { self: SymbolTable => // annotations private var rawannots: List[AnnotationInfoBase] = Nil + def rawAnnotations = rawannots /* Used in namer to check whether annotations were already assigned or not */ def hasAssignedAnnotations = rawannots.nonEmpty diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 4eca9f140e..96ff17e897 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -933,7 +933,7 @@ abstract class ClassfileParser { throw new RuntimeException("Scala class file does not contain Scala annotation") } if (settings.debug.value) - log("" + sym + "; annotations = " + sym.annotations) + log("" + sym + "; annotations = " + sym.rawAnnotations) } else in.skip(attrLen) -- cgit v1.2.3