diff options
| author | James Iry <jamesiry@gmail.com> | 2013-05-30 07:44:27 -0700 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-05-30 07:44:27 -0700 |
| commit | 60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a (patch) | |
| tree | b09a66b379c0065579a29d1fe4b3cab73148f06b /src | |
| parent | d16786d1ec75c50a9934eb4d9203bc551c51e2d1 (diff) | |
| parent | 75251f76001d3c781b0630c2061603ebb250a787 (diff) | |
| download | scala-60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a.tar.gz scala-60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a.tar.bz2 scala-60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a.zip | |
Merge pull request #2608 from retronym/ticket/7532v2.10.2-RC2v2.10.2
SI-7532 Fix regression in Java inner classfile reader
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 8 |
1 files changed, 4 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 da117540b4..47a8b1f947 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -44,8 +44,6 @@ abstract class ClassfileParser { def srcfile = srcfile0 - private def currentIsTopLevel = !(currentClass.decodedName containsChar '$') - private object unpickler extends scala.reflect.internal.pickling.UnPickler { val global: ClassfileParser.this.global.type = ClassfileParser.this.global } @@ -515,8 +513,10 @@ abstract class ClassfileParser { } } - val c = if (currentIsTopLevel) pool.getClassSymbol(nameIdx) else clazz - if (currentIsTopLevel) { + val isTopLevel = !(currentClass containsChar '$') // Java class name; *don't* try to to use Scala name decoding (SI-7532) + + val c = if (isTopLevel) pool.getClassSymbol(nameIdx) else clazz + if (isTopLevel) { if (c != clazz) { if ((clazz eq NoSymbol) && (c ne NoSymbol)) clazz = c else mismatchError(c) |