diff options
author | Paul Phillips <paulp@improving.org> | 2012-11-13 14:19:52 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-11-13 14:19:52 -0800 |
commit | cbaa5b3c17ba309418e233ca3db30ed822fd66b6 (patch) | |
tree | c47d65dbe79920efbcd8ae5cf7be302d689a5b1a /src/compiler | |
parent | 91abce5d1a5c5681dbac565cb4cbcf81ff54bb60 (diff) | |
parent | b540aaee4ba30e2dd980456a44e8c6d732222df1 (diff) | |
download | scala-cbaa5b3c17ba309418e233ca3db30ed822fd66b6.tar.gz scala-cbaa5b3c17ba309418e233ca3db30ed822fd66b6.tar.bz2 scala-cbaa5b3c17ba309418e233ca3db30ed822fd66b6.zip |
Merge pull request #1599 from jannic/SI-6637
SI-6637
Diffstat (limited to 'src/compiler')
-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 5c18d1dc6d..cfc3d0a377 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -1033,17 +1033,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 } } |