diff options
author | Paul Phillips <paulp@improving.org> | 2013-01-24 16:41:23 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-01-24 16:41:23 -0800 |
commit | 40bf1d8d8e300cab0f9a5f8dc78fc26a8e44f869 (patch) | |
tree | 32902d6a3cb118b23eb8436b35fa56ab313a655b /src | |
parent | 6448f00b175d84f1a4f37ddcca232b32be89ecab (diff) | |
parent | 4dceb2268780462823a98168d7350687d5cf27a8 (diff) | |
download | scala-40bf1d8d8e300cab0f9a5f8dc78fc26a8e44f869.tar.gz scala-40bf1d8d8e300cab0f9a5f8dc78fc26a8e44f869.tar.bz2 scala-40bf1d8d8e300cab0f9a5f8dc78fc26a8e44f869.zip |
Merge pull request #1952 from retronym/backport/1599
[backport] Fix SI-6637 (misoptimization in erasure)
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 41aada473a..889d309ba9 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -1057,17 +1057,17 @@ abstract class Erasure extends AddInterfaces Apply(Select(qual, cmpOp), List(gen.mkAttributedQualifier(targ.tpe))) } case RefinedType(parents, decls) if (parents.length >= 2) => - // Optimization: don't generate isInstanceOf tests if the static type - // conforms, because it always succeeds. (Or at least it had better.) - // At this writing the pattern matcher generates some instance tests - // involving intersections where at least one parent is statically known true. - // That needs fixing, but filtering the parents here adds an additional - // level of robustness (in addition to the short term fix.) - val parentTests = parents filterNot (qual.tpe <:< _) - - if (parentTests.isEmpty) Literal(Constant(true)) - else gen.evalOnce(qual, currentOwner, unit) { q => - atPos(tree.pos) { + gen.evalOnce(qual, currentOwner, unit) { q => + // Optimization: don't generate isInstanceOf tests if the static type + // conforms, because it always succeeds. (Or at least it had better.) + // At this writing the pattern matcher generates some instance tests + // involving intersections where at least one parent is statically known true. + // That needs fixing, but filtering the parents here adds an additional + // level of robustness (in addition to the short term fix.) + val parentTests = parents filterNot (qual.tpe <:< _) + + if (parentTests.isEmpty) Literal(Constant(true)) + else atPos(tree.pos) { parentTests map mkIsInstanceOf(q) reduceRight gen.mkAnd } } |