diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-10-09 00:30:26 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-10-09 00:30:26 +1000 |
| commit | 9a8703450b09d5a671132865d3c26f64c3c2cfdf (patch) | |
| tree | f27674d973a8a910a5c055b90d5c4029cfabe77a | |
| parent | 24a0777219d647ec310a0b6da305f619f69950cd (diff) | |
| download | scala-9a8703450b09d5a671132865d3c26f64c3c2cfdf.tar.gz scala-9a8703450b09d5a671132865d3c26f64c3c2cfdf.tar.bz2 scala-9a8703450b09d5a671132865d3c26f64c3c2cfdf.zip | |
SI-5583 Remove the workaround for specialization bug
08505bd added a workaround for an undiagnosed interaction
between resident compilation and specialzation. This is no
longer needed after the previous commit.
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index f56739b811..9c81e31ad9 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -1499,20 +1499,13 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { val residualTargs = symbol.info.typeParams zip baseTargs collect { case (tvar, targ) if !env.contains(tvar) || !isPrimitiveValueClass(env(tvar).typeSymbol) => targ } - // See SI-5583. Don't know why it happens now if it didn't before. - if (specMember.info.typeParams.isEmpty && residualTargs.nonEmpty) { - devWarning("Type args to be applied, but symbol says no parameters: " + ((specMember.defString, residualTargs))) - baseTree - } - else { - ifDebug(assert(residualTargs.length == specMember.info.typeParams.length, - "residual: %s, tparams: %s, env: %s".format(residualTargs, specMember.info.typeParams, env)) - ) + ifDebug(assert(residualTargs.length == specMember.info.typeParams.length, + "residual: %s, tparams: %s, env: %s".format(residualTargs, specMember.info.typeParams, env)) + ) - val tree1 = gen.mkTypeApply(specTree, residualTargs) - debuglog("rewrote " + tree + " to " + tree1) - localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method - } + val tree1 = gen.mkTypeApply(specTree, residualTargs) + debuglog("rewrote " + tree + " to " + tree1) + localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method } curTree = tree |