diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-04-14 22:19:33 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-04-14 22:19:33 +0000 |
| commit | c9bb938eb0510cb199328481f3b90c0850cd67e2 (patch) | |
| tree | c5739ba06aef1020fce1ed7e0385a4f9688ff7b1 /src | |
| parent | 4153ff128233127b9101ac30ba223954a6bd6941 (diff) | |
| download | scala-c9bb938eb0510cb199328481f3b90c0850cd67e2.tar.gz scala-c9bb938eb0510cb199328481f3b90c0850cd67e2.tar.bz2 scala-c9bb938eb0510cb199328481f3b90c0850cd67e2.zip | |
Temporarily reverted r17501
(until Iulian comes back)
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index 8fda1d9767..73081e1c9a 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -418,10 +418,9 @@ abstract class GenJVM extends SubComponent { nattr } - 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))) { + def addGenericSignature(jmember: JMember, sym: Symbol, owner: Symbol) { + if (!sym.hasFlag(Flags.LIFTED | + Flags.EXPANDEDNAME | Flags.SYNTHETIC) && settings.target.value == "jvm-1.5") { val memberTpe = atPhase(currentRun.erasurePhase)(owner.thisType.memberInfo(sym)) // println("sym: " + sym.fullNameString + " : " + memberTpe + " sym.info: " + sym.info) erasure.javaSig(sym, memberTpe) match { |