diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-04-14 22:43:05 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-04-14 22:43:05 +0000 |
| commit | c8639e6f9cc5e3e2bb5dabdbf864660d72a7c684 (patch) | |
| tree | ffb175b77357ba4d60265f6eed089a194572d63e /src | |
| parent | c9bb938eb0510cb199328481f3b90c0850cd67e2 (diff) | |
| download | scala-c8639e6f9cc5e3e2bb5dabdbf864660d72a7c684.tar.gz scala-c8639e6f9cc5e3e2bb5dabdbf864660d72a7c684.tar.bz2 scala-c8639e6f9cc5e3e2bb5dabdbf864660d72a7c684.zip | |
Fixed conflicting changes propagated from the 2.7.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 5 |
1 files changed, 3 insertions, 2 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..a5616c863f 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -419,8 +419,9 @@ abstract class GenJVM extends SubComponent { } def addGenericSignature(jmember: JMember, sym: Symbol, owner: Symbol) { - if (!sym.hasFlag(Flags.LIFTED | - Flags.EXPANDEDNAME | Flags.SYNTHETIC) && settings.target.value == "jvm-1.5") { + 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 { |