diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-12 21:23:04 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-12 21:23:04 +0200 |
| commit | 6cb6d37c99bb66d5a83cbaa4633bba0f2aa8c1ba (patch) | |
| tree | 185d969d9d62112491acaf09cd4812ecee3296e1 | |
| parent | 984fe09b6e79912d93dc526a287badd83063d81e (diff) | |
| parent | 32514aac8b0f301be5bf451eb68f28e9bd7f929a (diff) | |
| download | scala-6cb6d37c99bb66d5a83cbaa4633bba0f2aa8c1ba.tar.gz scala-6cb6d37c99bb66d5a83cbaa4633bba0f2aa8c1ba.tar.bz2 scala-6cb6d37c99bb66d5a83cbaa4633bba0f2aa8c1ba.zip | |
Merge pull request #3742 from retronym/topic/8578
SI-8578 Avoid fresh name clashes under -Ydelambdafy:method
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Delambdafy.scala | 4 | ||||
| -rw-r--r-- | test/files/pos/t8578.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/t8578.scala | 18 |
3 files changed, 21 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala index 1468680fe0..1f8ab7e887 100644 --- a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala +++ b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala @@ -132,7 +132,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre } val params = ((optionSymbol(thisProxy) map {proxy:Symbol => ValDef(proxy)}) ++ (target.paramss.flatten map ValDef.apply)).toList - val methSym = oldClass.newMethod(unit.freshTermName(nme.accessor.toString()), target.pos, FINAL | BRIDGE | SYNTHETIC | PROTECTED | STATIC) + val methSym = oldClass.newMethod(unit.freshTermName(nme.accessor.toString() + "$"), target.pos, FINAL | BRIDGE | SYNTHETIC | PROTECTED | STATIC) val paramSyms = params map {param => methSym.newSyntheticValueParam(param.symbol.tpe, param.name) } @@ -238,7 +238,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre // - reinstate the assertion in `Erasure.resolveAnonymousBridgeClash` val suffix = "$lambda$" + ( if (funOwner.isPrimaryConstructor) "" - else "$" + funOwner.name + else "$" + funOwner.name + "$" ) val name = unit.freshTypeName(s"${oldClass.name.decode}$suffix") diff --git a/test/files/pos/t8578.flags b/test/files/pos/t8578.flags new file mode 100644 index 0000000000..48b438ddf8 --- /dev/null +++ b/test/files/pos/t8578.flags @@ -0,0 +1 @@ +-Ydelambdafy:method diff --git a/test/files/pos/t8578.scala b/test/files/pos/t8578.scala new file mode 100644 index 0000000000..879b5f5550 --- /dev/null +++ b/test/files/pos/t8578.scala @@ -0,0 +1,18 @@ +class DuplicateClassName { + () => { + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => ()} + {() => () => ()} + {() => ()} + } +} +// Was: +// Different class symbols have the same bytecode-level internal name: +// name: DuplicateClassName$lambda$$$anonfun$111
\ No newline at end of file |