summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-02-21 14:47:53 +0000
committerMartin Odersky <odersky@gmail.com>2011-02-21 14:47:53 +0000
commit3594304e825f6cd255a1cf61807dd3408ab3b5da (patch)
tree00cd1a44262ad561107fd7620944b1d4af5278ac /src/compiler
parent7a9aba47d5a08e77ccb41a00a3d143d93f74e41e (diff)
downloadscala-3594304e825f6cd255a1cf61807dd3408ab3b5da.tar.gz
scala-3594304e825f6cd255a1cf61807dd3408ab3b5da.tar.bz2
scala-3594304e825f6cd255a1cf61807dd3408ab3b5da.zip
Attempt to fix #4214 by avoiding signature gene...
Attempt to fix #4214 by avoiding signature generation for mixed in and bridge methods.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/transform/Erasure.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index 70ecea4db5..a468d71352 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -225,7 +225,7 @@ abstract class Erasure extends AddInterfaces
/** The Java signature of type 'info', for symbol sym. The symbol is used to give the right return
* type for constructors.
*/
- def javaSig(sym0: Symbol, info: Type): Option[String] = atPhase(currentRun.erasurePhase) {
+ def javaSig(sym0: Symbol, info: Type): Option[String] = if (sym0.hasFlag(BRIDGE | MIXEDIN)) None else atPhase(currentRun.erasurePhase) {
def jsig(tp: Type, mustBox: Boolean) = {
(boxedClass get tp.typeSymbol) match {
case Some(boxed) if mustBox => jsig2(false, true, Nil, boxed.tpe)