diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-03-26 12:39:24 +0100 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-03-26 12:39:24 +0100 |
commit | c74e1325ff1514b1042c959b0b268b3c6bf8d349 (patch) | |
tree | 3ac99232469e17ff0d69113ce2ff2fbc59ab6050 /src/compiler | |
parent | 2af68eec522c97af14b8fad372fc3c0addf7d604 (diff) | |
parent | 8262ed2fc618d27258eb975fd401b31f1064cc3e (diff) | |
download | scala-c74e1325ff1514b1042c959b0b268b3c6bf8d349.tar.gz scala-c74e1325ff1514b1042c959b0b268b3c6bf8d349.tar.bz2 scala-c74e1325ff1514b1042c959b0b268b3c6bf8d349.zip |
Merge pull request #3655 from retronym/ticket/8442
SI-8442 Ignore stub annotation symbols in `AnnotationInfo#matches`
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 2955986a7e..6991cfa37b 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -436,9 +436,13 @@ abstract class ClassfileParser { // SI-5593 Scaladoc's current strategy is to visit all packages in search of user code that can be documented // therefore, it will rummage through the classpath triggering errors whenever it encounters package objects // that are not in their correct place (see bug for details) - if (!settings.isScaladoc) - warning(s"Class $name not found - continuing with a stub.") - return NoSymbol.newClass(name.toTypeName) + + // TODO More consistency with use of stub symbols in `Unpickler` + // - better owner than `NoSymbol` + // - remove eager warning + val msg = s"Class $name not found - continuing with a stub." + if (!settings.isScaladoc) warning(msg) + return NoSymbol.newStubSymbol(name.toTypeName, msg) } val completer = new global.loaders.ClassfileLoader(file) var owner: Symbol = rootMirror.RootClass |