diff options
author | Paul Phillips <paulp@improving.org> | 2010-11-25 00:00:14 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-11-25 00:00:14 +0000 |
commit | b766d4bc9a87ec988d1e9b6af7373b7501e44daa (patch) | |
tree | 54b161045f32f0e17cbd46161076e6d52b296a69 /src | |
parent | 597acf7b0c26ca94a34f188fc2919b8482c3ab0a (diff) | |
download | scala-b766d4bc9a87ec988d1e9b6af7373b7501e44daa.tar.gz scala-b766d4bc9a87ec988d1e9b6af7373b7501e44daa.tar.bz2 scala-b766d4bc9a87ec988d1e9b6af7373b7501e44daa.zip |
Changing EnclosingMethod generation not to drop...
Changing EnclosingMethod generation not to drop the trailing $ from the
name of the container class. I'm sure this was done for some reason but
proguard objects rather strenuously (and fails) because it can't find
the method, since it says it's in the class but is really in the object.
Review by dragos.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 4046195ce2..d737de6976 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -297,7 +297,6 @@ abstract class GenJVM extends SubComponent { if (sym.isMethod) { log("enclosing method for %s is %s".format(clazz, sym)) var outerName = javaName(sym.enclClass) - if (outerName.endsWith("$")) outerName = outerName.dropRight(1) jclass.addAttribute(fjbgContext.JEnclosingMethodAttribute(jclass, outerName, javaName(sym), javaType(sym))) } } |