diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-04-14 16:15:24 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-04-14 16:15:24 +0000 |
| commit | 4153ff128233127b9101ac30ba223954a6bd6941 (patch) | |
| tree | f70fb3b2a0d566569e5c036e0331bde2995f8e5a /src/compiler | |
| parent | 6556ff6af36ddce6fb265c7a908cd90f0bf86599 (diff) | |
| download | scala-4153ff128233127b9101ac30ba223954a6bd6941.tar.gz scala-4153ff128233127b9101ac30ba223954a6bd6941.tar.bz2 scala-4153ff128233127b9101ac30ba223954a6bd6941.zip | |
Propagated fix for #1882
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 73081e1c9a..8fda1d9767 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -418,9 +418,10 @@ abstract class GenJVM extends SubComponent { nattr } - def addGenericSignature(jmember: JMember, sym: Symbol, owner: Symbol) { - if (!sym.hasFlag(Flags.LIFTED | - Flags.EXPANDEDNAME | Flags.SYNTHETIC) && settings.target.value == "jvm-1.5") { + def addGenericSignature(jmember: JMember, sym: Symbol) { + if (settings.target.value == "jvm-1.5" + && !sym.hasFlag(Flags.EXPANDEDNAME | Flags.SYNTHETIC) + && !(sym.isMethod && sym.hasFlag(Flags.LIFTED))) { val memberTpe = atPhase(currentRun.erasurePhase)(owner.thisType.memberInfo(sym)) // println("sym: " + sym.fullNameString + " : " + memberTpe + " sym.info: " + sym.info) erasure.javaSig(sym, memberTpe) match { |