diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-21 11:41:14 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-21 11:41:14 -0700 |
commit | 906584d89cf5eb92b3859c5ae099b54b280208bc (patch) | |
tree | 91ed07dcb7b314b143cfe6f8c87485c7d66a32bf /src | |
parent | c63edcd0b9e44b20759316a3d4ff9daba4cdece7 (diff) | |
parent | c51080b78385402c941e5280d1740406ea8702d0 (diff) | |
download | scala-906584d89cf5eb92b3859c5ae099b54b280208bc.tar.gz scala-906584d89cf5eb92b3859c5ae099b54b280208bc.tar.bz2 scala-906584d89cf5eb92b3859c5ae099b54b280208bc.zip |
Merge pull request #4457 from retronym/ticket/9268
SI-9268 Be robust against absent classfiles during signature parsing
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 994bcd8359..a59b9d3f48 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -1141,16 +1141,12 @@ abstract class ClassfileParser { private def innerSymbol(entry: InnerClassEntry): Symbol = { val name = entry.originalName.toTypeName val enclosing = entry.enclosing - def getMember = ( + val member = ( if (enclosing == clazz) entry.scope lookup name else lookupMemberAtTyperPhaseIfPossible(enclosing, name) ) - getMember - /* There used to be an assertion that this result is not NoSymbol; changing it to an error - * revealed it had been going off all the time, but has been swallowed by a catch t: Throwable - * in Repository.scala. Since it has been accomplishing nothing except misleading anyone who - * thought it wasn't triggering, I removed it entirely. - */ + def newStub = enclosing.newStubSymbol(name, s"Unable to locate class corresponding to inner class entry for $name in owner ${entry.outerName}") + member.orElse(newStub) } } |