diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-02-08 10:46:35 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-03-26 09:31:05 -0700 |
commit | 52496ba844c4a5ffd2ed1000da839f8b7aa2e915 (patch) | |
tree | 9baf3e1dc6e278de78d8a6bb47c4d010e67dbbe0 /src/compiler/scala/tools/nsc/transform/LambdaLift.scala | |
parent | 4356ac7a1d2cae67d80af84c64a6c2d941a11b4b (diff) | |
download | scala-52496ba844c4a5ffd2ed1000da839f8b7aa2e915.tar.gz scala-52496ba844c4a5ffd2ed1000da839f8b7aa2e915.tar.bz2 scala-52496ba844c4a5ffd2ed1000da839f8b7aa2e915.zip |
Remove dead code now that `genBCodeActive` is always true.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/LambdaLift.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/LambdaLift.scala | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala index 7a5bd747c4..074acc1332 100644 --- a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala +++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala @@ -223,10 +223,6 @@ abstract class LambdaLift extends InfoTransform { debuglog("renaming in %s: %s => %s".format(sym.owner.fullLocationString, originalName, sym.name)) } - // make sure that the name doesn't make the symbol accidentally `isAnonymousClass` (et.al) by - // introducing `$anon` in its name. - def nonAnon(s: String) = nme.ensureNonAnon(s) - def newName(sym: Symbol): Name = { val originalName = sym.name def freshen(prefix: String): Name = @@ -235,7 +231,7 @@ abstract class LambdaLift extends InfoTransform { val join = nme.NAME_JOIN_STRING if (sym.isAnonymousFunction && sym.owner.isMethod) { - freshen(sym.name + join + nonAnon(sym.owner.name.toString) + join) + freshen(sym.name + join + nme.ensureNonAnon(sym.owner.name.toString) + join) } else { val name = freshen(sym.name + join) // SI-5652 If the lifted symbol is accessed from an inner class, it will be made public. (where?) @@ -243,7 +239,7 @@ abstract class LambdaLift extends InfoTransform { // package - subclass might have the same name), avoids a VerifyError in the case // that a sub-class happens to lifts out a method with the *same* name. if (originalName.isTermName && calledFromInner(sym)) - newTermNameCached(nonAnon(sym.enclClass.fullName('$')) + nme.EXPAND_SEPARATOR_STRING + name) + newTermNameCached(nme.ensureNonAnon(sym.enclClass.fullName('$')) + nme.EXPAND_SEPARATOR_STRING + name) else name } |