Fix SI-6637 (misoptimization in erasure)

Move the optimization one level deeper so the expression
being tested with isInstanceOf is always evaluated.

3 files changed, 20 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
                     }
                   }
diff --git a/test/files/run/t6637.check b/test/files/run/t6637.check
new file mode 100644
index 0000000000..9766475a41
--- /dev/null
+++ b/test/files/run/t6637.check
@@ -0,0 +1 @@
+ok
diff --git a/test/files/run/t6637.scala b/test/files/run/t6637.scala
new file mode 100644
index 0000000000..d3c380370b
--- /dev/null
+++ b/test/files/run/t6637.scala
@@ -0,0 +1,8 @@
+
+object Test extends App {
+  try {
+    class A ; class B ; List().head.isInstanceOf[A with B]
+  } catch {
+    case _ :java.util.NoSuchElementException => println("ok")
+  }
+}