diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-05 11:38:44 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-05 12:06:52 -0800 |
commit | fe94bc7a144921f6c3dcbedbedd2c5c884a77bbd (patch) | |
tree | 3610cfc3662e4b1cd859129b1190f8a6e7d550b5 /src/compiler | |
parent | be46e487134305edae065de00582928c120bcfbb (diff) | |
download | scala-fe94bc7a144921f6c3dcbedbedd2c5c884a77bbd.tar.gz scala-fe94bc7a144921f6c3dcbedbedd2c5c884a77bbd.tar.bz2 scala-fe94bc7a144921f6c3dcbedbedd2c5c884a77bbd.zip |
Don't mark mixed in methods as bridges.
Sometime during the signature-related chaos before 2.9.1,
genjvm was modified to pin ACC_BRIDGE onto mixed-in methods.
This isn't necessary to suppress the signature (which has
already happened at that point) and has deleterious effects
since many tools ignore bridge methods. Review by @odersky.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index ff98537907..241163885d 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -1901,7 +1901,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with if (sym.isInterface) ACC_INTERFACE else 0, if (finalFlag) ACC_FINAL else 0, if (sym.isStaticMember) ACC_STATIC else 0, - if (sym.isBridge || sym.hasFlag(Flags.MIXEDIN) && sym.isMethod) ACC_BRIDGE else 0, + if (sym.isBridge) ACC_BRIDGE else 0, if (sym.isClass && !sym.isInterface) ACC_SUPER else 0, if (sym.isVarargsMethod) ACC_VARARGS else 0 ) |