From b766d4bc9a87ec988d1e9b6af7373b7501e44daa Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 25 Nov 2010 00:00:14 +0000 Subject: 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. --- src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 1 - 1 file changed, 1 deletion(-) (limited to 'src/compiler') 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))) } } -- cgit v1.2.3