diff options
| author | Paul Phillips <paulp@improving.org> | 2011-02-24 06:00:30 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-02-24 06:00:30 +0000 |
| commit | dd45d81acf8b4e8961406b5b940e1dd70153c2a4 (patch) | |
| tree | 394a1866f7c93d33a222a820f277f33eacd0c741 /src | |
| parent | 11b936a03a749606df6612ef9c0a639c75bce765 (diff) | |
| download | scala-dd45d81acf8b4e8961406b5b940e1dd70153c2a4.tar.gz scala-dd45d81acf8b4e8961406b5b940e1dd70153c2a4.tar.bz2 scala-dd45d81acf8b4e8961406b5b940e1dd70153c2a4.zip | |
Reversion of r24319 for causing #4291.
in future attempts. Closes #4291, references #4214, no review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 2 |
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 a468d71352..70ecea4db5 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] = if (sym0.hasFlag(BRIDGE | MIXEDIN)) None else atPhase(currentRun.erasurePhase) { + def javaSig(sym0: Symbol, info: Type): Option[String] = 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) |