Merge remote-tracking branch 'upstream/2.12.x' into opt/elimBoxes

135 files changed, 356 insertions, 1672 deletions

diff --git a/test/files/instrumented/inline-in-constructors.flags b/test/files/instrumented/inline-in-constructors.flags
index d1ebc4c940..65caa3736e 100644
--- a/test/files/instrumented/inline-in-constructors.flags
+++ b/test/files/instrumented/inline-in-constructors.flags
@@ -1 +1 @@
--optimise -Ydelambdafy:inline -Ybackend:GenASM
+-Yopt:l:classpath
diff --git a/test/files/jvm/bytecode-test-example/Foo_1.flags b/test/files/jvm/bytecode-test-example/Foo_1.flags
deleted file mode 100644
index 49f2d2c4c8..0000000000
--- a/test/files/jvm/bytecode-test-example/Foo_1.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ybackend:GenASM
diff --git a/test/files/jvm/constant-optimization/Foo_1.flags b/test/files/jvm/constant-optimization/Foo_1.flags
deleted file mode 100644
index 67a1dbe8da..0000000000
--- a/test/files/jvm/constant-optimization/Foo_1.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ynooptimise -Yconst-opt -Ybackend:GenASM
\ No newline at end of file
diff --git a/test/files/jvm/constant-optimization/Foo_1.scala b/test/files/jvm/constant-optimization/Foo_1.scala
deleted file mode 100644
index cb67ad4e90..0000000000
--- a/test/files/jvm/constant-optimization/Foo_1.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-class Foo_1 {
-  def foo() {
-  	// constant optimization should eliminate all branches
-    val i = 1
-    val x = if (i != 1) null else "good"
-    val y = if (x == null) "good" else x + ""
-    println(y)
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/constant-optimization/Test.scala b/test/files/jvm/constant-optimization/Test.scala
deleted file mode 100644
index dc0f8f6103..0000000000
--- a/test/files/jvm/constant-optimization/Test.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-
-import scala.tools.partest.BytecodeTest
-import scala.tools.asm
-import asm.tree.InsnList
-import scala.collection.JavaConverters._
-
-object Test extends BytecodeTest {
-  val comparisons = Set(asm.Opcodes.IF_ACMPEQ, asm.Opcodes.IF_ACMPNE, asm.Opcodes.IF_ICMPEQ, asm.Opcodes.IF_ICMPGE, asm.Opcodes.IF_ICMPGT, asm.Opcodes.IF_ICMPLE,
-    asm.Opcodes.IF_ICMPLT, asm.Opcodes.IF_ICMPNE, asm.Opcodes.IFEQ, asm.Opcodes.IFGE, asm.Opcodes.IFGT, asm.Opcodes.IFLE, asm.Opcodes.IFLT,
-    asm.Opcodes.IFNE, asm.Opcodes.IFNONNULL, asm.Opcodes.IFNULL)
-
-  def show: Unit = {
-    val classNode = loadClassNode("Foo_1")
-    val methodNode = getMethod(classNode, "foo")
-    // after optimization there should be no comparisons left
-    val expected = 0
-
-    val got = countComparisons(methodNode.instructions)
-    assert(got == expected, s"expected $expected but got $got comparisons")
-  }
-
-  def countComparisons(insnList: InsnList): Int = {
-    def isComparison(node: asm.tree.AbstractInsnNode): Boolean =
-      (comparisons contains node.getOpcode)
-    insnList.iterator.asScala count isComparison
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/nooptimise/Foo_1.flags b/test/files/jvm/nooptimise/Foo_1.flags
deleted file mode 100644
index f493cf9f3f..0000000000
--- a/test/files/jvm/nooptimise/Foo_1.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ybackend:GenASM -optimise -Ynooptimise
\ No newline at end of file
diff --git a/test/files/jvm/nooptimise/Foo_1.scala b/test/files/jvm/nooptimise/Foo_1.scala
deleted file mode 100644
index 896d5695de..0000000000
--- a/test/files/jvm/nooptimise/Foo_1.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-class Foo_1 {
-  def foo() {
-    // optimization will remove this magic 3 from appearing in the source
-    // so -Ynooptimize should prevent that
-    val x = 3
-
-  }
-}
diff --git a/test/files/jvm/nooptimise/Test.scala b/test/files/jvm/nooptimise/Test.scala
deleted file mode 100644
index 7b7ecd6dbd..0000000000
--- a/test/files/jvm/nooptimise/Test.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-import scala.tools.partest.BytecodeTest
-import scala.tools.asm
-import asm.tree.InsnList
-import scala.collection.JavaConverters._
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val classNode = loadClassNode("Foo_1")
-    val methodNode = getMethod(classNode, "foo")
-    // if optimization didn't run then
-    // there should be some useless instructions
-    // with the magic constant 3
-    val expected = 1
-    val got = countMagicThrees(methodNode.instructions)
-    assert(got == expected, s"expected $expected but got $got magic threes")
-  }
-
-  def countMagicThrees(insnList: InsnList): Int = {
-    def isMagicThree(node: asm.tree.AbstractInsnNode): Boolean =
-      (node.getOpcode == asm.Opcodes.ICONST_3)
-    insnList.iterator.asScala.count(isMagicThree)
-  }
-}
diff --git a/test/files/jvm/patmat_opt_ignore_underscore.check b/test/files/jvm/patmat_opt_ignore_underscore.check
deleted file mode 100644
index 43f53aba12..0000000000
--- a/test/files/jvm/patmat_opt_ignore_underscore.check
+++ /dev/null
@@ -1 +0,0 @@
-bytecode identical
diff --git a/test/files/jvm/patmat_opt_ignore_underscore.flags b/test/files/jvm/patmat_opt_ignore_underscore.flags
deleted file mode 100644
index 2cd4b38726..0000000000
--- a/test/files/jvm/patmat_opt_ignore_underscore.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
diff --git a/test/files/jvm/patmat_opt_ignore_underscore/Analyzed_1.scala b/test/files/jvm/patmat_opt_ignore_underscore/Analyzed_1.scala
deleted file mode 100644
index b0506018f6..0000000000
--- a/test/files/jvm/patmat_opt_ignore_underscore/Analyzed_1.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-// this class's bytecode, compiled under -optimize is analyzed by the test
-// method a's bytecode should be identical to method b's bytecode
-// this is not the best test for shielding against regressing on this particular issue,
-// but it sets the stage for checking the bytecode emitted by the pattern matcher and
-// comparing it to manually tuned code using if/then/else etc.
-class SameBytecode {
-  case class Foo(x: Any, y: String)
-
-  def a =
-    Foo(1, "a") match {
-      case Foo(_: String, y) => y
-    }
-
-  // this method's body holds the tree that should be generated by the pattern matcher for method a (-Xprint:patmat)
-  // the test checks that bytecode for a and b is identical (modulo line numbers)
-  // we can't diff trees as they are quite different (patmat uses jumps to labels that cannot be expressed in source, for example)
-  // note that the actual tree is quite bad: we do an unnecessary null check, isInstanceOf and local val (x3)
-  // some of these will be fixed soon (the initial null check is for the scrutinee, which is harder to fix in patmat)
-  def b: String = {
-    val x1 = Foo(1, "a")
-    if (x1.ne(null)) {
-      if (x1.x.isInstanceOf[String]) {
-        return x1.y
-      }
-    }
-
-    throw new MatchError(x1)
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/patmat_opt_ignore_underscore/test.scala b/test/files/jvm/patmat_opt_ignore_underscore/test.scala
deleted file mode 100644
index d6630e80a0..0000000000
--- a/test/files/jvm/patmat_opt_ignore_underscore/test.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * filter: inliner warning; re-run with
- */
-import scala.tools.partest.BytecodeTest
-
-import scala.tools.nsc.util.JavaClassPath
-import java.io.InputStream
-import scala.tools.asm
-import asm.ClassReader
-import asm.tree.{ClassNode, InsnList}
-import scala.collection.JavaConverters._
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val classNode = loadClassNode("SameBytecode")
-    sameBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"))
-  }
-}
diff --git a/test/files/jvm/patmat_opt_no_nullcheck.check b/test/files/jvm/patmat_opt_no_nullcheck.check
deleted file mode 100644
index 43f53aba12..0000000000
--- a/test/files/jvm/patmat_opt_no_nullcheck.check
+++ /dev/null
@@ -1 +0,0 @@
-bytecode identical
diff --git a/test/files/jvm/patmat_opt_no_nullcheck.flags b/test/files/jvm/patmat_opt_no_nullcheck.flags
deleted file mode 100644
index 2cd4b38726..0000000000
--- a/test/files/jvm/patmat_opt_no_nullcheck.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
diff --git a/test/files/jvm/patmat_opt_no_nullcheck/Analyzed_1.scala b/test/files/jvm/patmat_opt_no_nullcheck/Analyzed_1.scala
deleted file mode 100644
index 1e4d564cdf..0000000000
--- a/test/files/jvm/patmat_opt_no_nullcheck/Analyzed_1.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-// this class's bytecode, compiled under -optimize is analyzed by the test
-// method a's bytecode should be identical to method b's bytecode
-case class Foo(x: Any)
-
-class SameBytecode {
-  def a =
-    (Foo(1): Any) match {
-      case Foo(_: String) =>
-    }
-
-  // there's no null check
-  def b: Unit = {
-    val x1: Any = Foo(1)
-    if (x1.isInstanceOf[Foo]) {
-      val x3 = x1.asInstanceOf[Foo]
-      if (x3.x.isInstanceOf[String]) {
-        val x = ()
-        return
-      }
-    }
-
-    throw new MatchError(x1)
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/patmat_opt_no_nullcheck/test.scala b/test/files/jvm/patmat_opt_no_nullcheck/test.scala
deleted file mode 100644
index d02c929e01..0000000000
--- a/test/files/jvm/patmat_opt_no_nullcheck/test.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * filter: inliner warning; re-run with
- */
-import scala.tools.partest.BytecodeTest
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val classNode = loadClassNode("SameBytecode")
-    sameBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"))
-  }
-}
diff --git a/test/files/jvm/patmat_opt_primitive_typetest.check b/test/files/jvm/patmat_opt_primitive_typetest.check
deleted file mode 100644
index 43f53aba12..0000000000
--- a/test/files/jvm/patmat_opt_primitive_typetest.check
+++ /dev/null
@@ -1 +0,0 @@
-bytecode identical
diff --git a/test/files/jvm/patmat_opt_primitive_typetest.flags b/test/files/jvm/patmat_opt_primitive_typetest.flags
deleted file mode 100644
index b9bb09167e..0000000000
--- a/test/files/jvm/patmat_opt_primitive_typetest.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimize -Ybackend:GenASM
diff --git a/test/files/jvm/patmat_opt_primitive_typetest/Analyzed_1.scala b/test/files/jvm/patmat_opt_primitive_typetest/Analyzed_1.scala
deleted file mode 100644
index c961082fa7..0000000000
--- a/test/files/jvm/patmat_opt_primitive_typetest/Analyzed_1.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-// this class's bytecode, compiled under -optimize is analyzed by the test
-// method a's bytecode should be identical to method b's bytecode
-class SameBytecode {
-  case class Foo(x: Int, y: String)
-
-  def a =
-    Foo(1, "a") match {
-      case Foo(_: Int, y) => y
-    }
-
-  // this method's body holds the tree that should be generated by the pattern matcher for method a (-Xprint:patmat)
-  // the test checks that bytecode for a and b is identical (modulo line numbers)
-  // we can't diff trees as they are quite different (patmat uses jumps to labels that cannot be expressed in source, for example)
-  // note that the actual tree is quite bad: we do an unnecessary null check, and local val (x3)
-  // some of these will be fixed soon (the initial null check is for the scrutinee, which is harder to fix in patmat)
-  def b: String = {
-    val x1 = Foo(1, "a")
-    if (x1.ne(null)) {
-      return x1.y
-    }
-
-    throw new MatchError(x1)
-  }
-}
\ No newline at end of file
diff --git a/test/files/jvm/patmat_opt_primitive_typetest/test.scala b/test/files/jvm/patmat_opt_primitive_typetest/test.scala
deleted file mode 100644
index 2927e763d5..0000000000
--- a/test/files/jvm/patmat_opt_primitive_typetest/test.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.tools.partest.BytecodeTest
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val classNode = loadClassNode("SameBytecode")
-    sameBytecode(getMethod(classNode, "a"), getMethod(classNode, "b"))
-  }
-}
diff --git a/test/files/jvm/t7006.check b/test/files/jvm/t7006.check
deleted file mode 100644
index 6294b14d62..0000000000
--- a/test/files/jvm/t7006.check
+++ /dev/null
@@ -1,29 +0,0 @@
-[running phase parser on Foo_1.scala]
-[running phase namer on Foo_1.scala]
-[running phase packageobjects on Foo_1.scala]
-[running phase typer on Foo_1.scala]
-[running phase patmat on Foo_1.scala]
-[running phase superaccessors on Foo_1.scala]
-[running phase extmethods on Foo_1.scala]
-[running phase pickler on Foo_1.scala]
-[running phase refchecks on Foo_1.scala]
-[running phase uncurry on Foo_1.scala]
-[running phase tailcalls on Foo_1.scala]
-[running phase specialize on Foo_1.scala]
-[running phase explicitouter on Foo_1.scala]
-[running phase erasure on Foo_1.scala]
-[running phase posterasure on Foo_1.scala]
-[running phase lazyvals on Foo_1.scala]
-[running phase lambdalift on Foo_1.scala]
-[running phase constructors on Foo_1.scala]
-[running phase flatten on Foo_1.scala]
-[running phase mixin on Foo_1.scala]
-[running phase cleanup on Foo_1.scala]
-[running phase delambdafy on Foo_1.scala]
-[running phase icode on Foo_1.scala]
-[running phase inliner on Foo_1.scala]
-[running phase inlinehandlers on Foo_1.scala]
-[running phase closelim on Foo_1.scala]
-[running phase constopt on Foo_1.scala]
-[running phase dce on Foo_1.scala]
-[running phase jvm on icode]
diff --git a/test/files/jvm/t7006/Foo_1.flags b/test/files/jvm/t7006/Foo_1.flags
deleted file mode 100644
index 29a9d424f0..0000000000
--- a/test/files/jvm/t7006/Foo_1.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise -Ydebug -Xfatal-warnings -Ybackend:GenASM
diff --git a/test/files/jvm/t7006/Foo_1.scala b/test/files/jvm/t7006/Foo_1.scala
deleted file mode 100644
index 3985557d9f..0000000000
--- a/test/files/jvm/t7006/Foo_1.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-class Foo_1 {
-  def foo {
-    try {
-      val x = 3 // this will be optimized away, leaving a useless jump only block
-    } finally {
-      print("hello")
-    }
-    while(true){} // ensure infinite loop doesn't break the algorithm
-  }
-}
diff --git a/test/files/jvm/t7006/Test.scala b/test/files/jvm/t7006/Test.scala
deleted file mode 100644
index 065a23510e..0000000000
--- a/test/files/jvm/t7006/Test.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-import scala.tools.partest.BytecodeTest
-import scala.tools.asm
-import asm.tree.InsnList
-import scala.collection.JavaConverters._
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val classNode = loadClassNode("Foo_1")
-    val methodNode = getMethod(classNode, "foo")
-    assert(count(methodNode.instructions, asm.Opcodes.NOP) == 0)
-    assert(count(methodNode.instructions, asm.Opcodes.GOTO) == 1)
-  }
-
-  def count(insnList: InsnList, opcode: Int): Int = {
-    def isNop(node: asm.tree.AbstractInsnNode): Boolean =
-      (node.getOpcode == opcode)
-    insnList.iterator.asScala.count(isNop)
-  }
-}
diff --git a/test/files/neg/case-collision.check b/test/files/neg/case-collision.check
index 22cf105a4f..7360833a7d 100644
--- a/test/files/neg/case-collision.check
+++ b/test/files/neg/case-collision.check
@@ -1,12 +1,12 @@
 case-collision.scala:5: warning: Class foo.BIPPY differs only in case from foo.Bippy. Such classes will overwrite one another on case-insensitive filesystems.
 class BIPPY
       ^
-case-collision.scala:11: warning: Class foo.HyRaX$ differs only in case from foo.Hyrax$. Such classes will overwrite one another on case-insensitive filesystems.
-object HyRaX
-       ^
 case-collision.scala:8: warning: Class foo.DINGO$ differs only in case from foo.Dingo$. Such classes will overwrite one another on case-insensitive filesystems.
 object DINGO
        ^
+case-collision.scala:11: warning: Class foo.HyRaX$ differs only in case from foo.Hyrax$. Such classes will overwrite one another on case-insensitive filesystems.
+object HyRaX
+       ^
 error: No warnings can be incurred under -Xfatal-warnings.
 three warnings found
 one error found
diff --git a/test/files/neg/case-collision.flags b/test/files/neg/case-collision.flags
index 14c1069dee..85d8eb2ba2 100644
--- a/test/files/neg/case-collision.flags
+++ b/test/files/neg/case-collision.flags
@@ -1 +1 @@
--Ybackend:GenASM -Xfatal-warnings
+-Xfatal-warnings
diff --git a/test/files/neg/depmet_1.check b/test/files/neg/depmet_1.check
index 7a4f845fd5..15498568c5 100644
--- a/test/files/neg/depmet_1.check
+++ b/test/files/neg/depmet_1.check
@@ -1,7 +1,7 @@
-depmet_1.scala:2: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one
+depmet_1.scala:2: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section
   def precise0(y: x.type)(x: String): Unit = {}
                           ^
-depmet_1.scala:3: error: illegal dependent method type: parameter appears in the type of another parameter in the same section or an earlier one
+depmet_1.scala:3: error: illegal dependent method type: parameter may only be referenced in a subsequent parameter section
   def precise1(x: String, y: x.type): Unit = {}
                ^
 depmet_1.scala:4: error: not found: value y
diff --git a/test/files/neg/macro-without-xmacros-a.check b/test/files/neg/macro-without-xmacros-a.check
index ec194be3a9..65445d80dd 100644
--- a/test/files/neg/macro-without-xmacros-a.check
+++ b/test/files/neg/macro-without-xmacros-a.check
@@ -2,7 +2,7 @@ Macros_2.scala:5: error: macro definition needs to be enabled
 by making the implicit value scala.language.experimental.macros visible.
 This can be achieved by adding the import clause 'import scala.language.experimental.macros'
 or by setting the compiler option -language:experimental.macros.
-See the Scala docs for value scala.language.experimental.macros for a discussion
+See the Scaladoc for value scala.language.experimental.macros for a discussion
 why the feature needs to be explicitly enabled.
     def foo(x: Int): Int = macro foo_impl
         ^
diff --git a/test/files/neg/macro-without-xmacros-b.check b/test/files/neg/macro-without-xmacros-b.check
index c97850f0a9..e3c1010d50 100644
--- a/test/files/neg/macro-without-xmacros-b.check
+++ b/test/files/neg/macro-without-xmacros-b.check
@@ -2,7 +2,7 @@ Macros_2.scala:3: error: macro definition needs to be enabled
 by making the implicit value scala.language.experimental.macros visible.
 This can be achieved by adding the import clause 'import scala.language.experimental.macros'
 or by setting the compiler option -language:experimental.macros.
-See the Scala docs for value scala.language.experimental.macros for a discussion
+See the Scaladoc for value scala.language.experimental.macros for a discussion
 why the feature needs to be explicitly enabled.
     def foo(x: Int): Int = macro Impls.foo_impl
         ^
diff --git a/test/files/neg/sealed-final-neg.check b/test/files/neg/sealed-final-neg.check
index 500d23f49a..e135f38f8b 100644
--- a/test/files/neg/sealed-final-neg.check
+++ b/test/files/neg/sealed-final-neg.check
@@ -1,4 +1,9 @@
-sealed-final-neg.scala:41: error: expected class or object definition
-"Due to SI-6142 this emits no warnings, so we'll just break it until that's fixed."
-^
+sealed-final-neg.scala:17: warning: neg1/Foo::bar(I)I is annotated @inline but cannot be inlined: the method is not final and may be overridden.
+    def f = Foo.mkFoo() bar 10
+                        ^
+sealed-final-neg.scala:37: warning: neg2/Foo::bar(I)I is annotated @inline but cannot be inlined: the method is not final and may be overridden.
+    def f = Foo.mkFoo() bar 10
+                        ^
+error: No warnings can be incurred under -Xfatal-warnings.
+two warnings found
 one error found
diff --git a/test/files/neg/sealed-final-neg.flags b/test/files/neg/sealed-final-neg.flags
index 3f0fcd2201..01bd79154a 100644
--- a/test/files/neg/sealed-final-neg.flags
+++ b/test/files/neg/sealed-final-neg.flags
@@ -1 +1 @@
--Xfatal-warnings -Ybackend:GenASM -Yinline-warnings -optimise
\ No newline at end of file
+-Xfatal-warnings -Yopt:l:project -Yinline-warnings
\ No newline at end of file
diff --git a/test/files/neg/sealed-final-neg.scala b/test/files/neg/sealed-final-neg.scala
index bc25330e13..ec3b199819 100644
--- a/test/files/neg/sealed-final-neg.scala
+++ b/test/files/neg/sealed-final-neg.scala
@@ -37,5 +37,3 @@ package neg2 {
     def f = Foo.mkFoo() bar 10
   }
 }
-
-"Due to SI-6142 this emits no warnings, so we'll just break it until that's fixed."
diff --git a/test/files/neg/t3234.check b/test/files/neg/t3234.check
deleted file mode 100644
index 8f0d624ed9..0000000000
--- a/test/files/neg/t3234.check
+++ /dev/null
@@ -1,6 +0,0 @@
-t3234.scala:17: warning: At the end of the day, could not inline @inline-marked method foo3
-    println(foo(42) + foo2(11) + foo3(2))
-                                     ^
-error: No warnings can be incurred under -Xfatal-warnings.
-one warning found
-one error found
diff --git a/test/files/neg/t3234.flags b/test/files/neg/t3234.flags
deleted file mode 100644
index 406231bd96..0000000000
--- a/test/files/neg/t3234.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Yinline-warnings -Xfatal-warnings -Ybackend:GenASM
diff --git a/test/files/neg/t6040.check b/test/files/neg/t6040.check
index 16c90ede7e..350f796d18 100644
--- a/test/files/neg/t6040.check
+++ b/test/files/neg/t6040.check
@@ -2,7 +2,7 @@ t6040.scala:1: error: extension of type scala.Dynamic needs to be enabled
 by making the implicit value scala.language.dynamics visible.
 This can be achieved by adding the import clause 'import scala.language.dynamics'
 or by setting the compiler option -language:dynamics.
-See the Scala docs for value scala.language.dynamics for a discussion
+See the Scaladoc for value scala.language.dynamics for a discussion
 why the feature needs to be explicitly enabled.
 class X extends Dynamic
                 ^
diff --git a/test/files/neg/t6120.check b/test/files/neg/t6120.check
index a7d17e29cf..f432fde32f 100644
--- a/test/files/neg/t6120.check
+++ b/test/files/neg/t6120.check
@@ -2,7 +2,7 @@ t6120.scala:5: warning: postfix operator bippy should be enabled
 by making the implicit value scala.language.postfixOps visible.
 This can be achieved by adding the import clause 'import scala.language.postfixOps'
 or by setting the compiler option -language:postfixOps.
-See the Scala docs for value scala.language.postfixOps for a discussion
+See the Scaladoc for value scala.language.postfixOps for a discussion
 why the feature should be explicitly enabled.
   def f = null == null bippy
                        ^
diff --git a/test/files/neg/t6446-additional.check b/test/files/neg/t6446-additional.check
index a87af2f1e5..e56a67b28b 100644
--- a/test/files/neg/t6446-additional.check
+++ b/test/files/neg/t6446-additional.check
@@ -22,18 +22,6 @@ superaccessors   6  add super accessors in traits and nested classes
          mixin  20  mixin composition
        cleanup  21  platform-specific cleanups, generate reflective calls
     delambdafy  22  remove lambdas
-         icode  23  generate portable intermediate code
-#partest -optimise
-       inliner  24  optimization: do inlining
-inlinehandlers  25  optimization: inline exception handlers
-      closelim  26  optimization: eliminate uncalled closures
-      constopt  27  optimization: optimize null and other constants
-           dce  28  optimization: eliminate dead code
-           jvm  29  generate JVM bytecode
-       ploogin  30  A sample phase that does so many things it's kind of hard...
-      terminal  31  the last phase during a compilation run
-#partest !-optimise
-           jvm  24  generate JVM bytecode
-       ploogin  25  A sample phase that does so many things it's kind of hard...
-      terminal  26  the last phase during a compilation run
-#partest
+           jvm  23  generate JVM bytecode
+       ploogin  24  A sample phase that does so many things it's kind of hard...
+      terminal  25  the last phase during a compilation run
diff --git a/test/files/neg/t6446-missing.check b/test/files/neg/t6446-missing.check
index 029c8057c3..15f0ceb6e3 100644
--- a/test/files/neg/t6446-missing.check
+++ b/test/files/neg/t6446-missing.check
@@ -23,16 +23,5 @@ superaccessors   6  add super accessors in traits and nested classes
          mixin  20  mixin composition
        cleanup  21  platform-specific cleanups, generate reflective calls
     delambdafy  22  remove lambdas
-         icode  23  generate portable intermediate code
-#partest !-optimise
-           jvm  24  generate JVM bytecode
-      terminal  25  the last phase during a compilation run
-#partest -optimise
-       inliner  24  optimization: do inlining
-inlinehandlers  25  optimization: inline exception handlers
-      closelim  26  optimization: eliminate uncalled closures
-      constopt  27  optimization: optimize null and other constants
-           dce  28  optimization: eliminate dead code
-           jvm  29  generate JVM bytecode
-      terminal  30  the last phase during a compilation run
-#partest
+           jvm  23  generate JVM bytecode
+      terminal  24  the last phase during a compilation run
diff --git a/test/files/neg/t6446-show-phases.check b/test/files/neg/t6446-show-phases.check
index 3ae3f96ef2..280a4f43d5 100644
--- a/test/files/neg/t6446-show-phases.check
+++ b/test/files/neg/t6446-show-phases.check
@@ -22,16 +22,5 @@ superaccessors   6  add super accessors in traits and nested classes
          mixin  20  mixin composition
        cleanup  21  platform-specific cleanups, generate reflective calls
     delambdafy  22  remove lambdas
-         icode  23  generate portable intermediate code
-#partest !-optimise
-           jvm  24  generate JVM bytecode
-      terminal  25  the last phase during a compilation run
-#partest -optimise
-       inliner  24  optimization: do inlining
-inlinehandlers  25  optimization: inline exception handlers
-      closelim  26  optimization: eliminate uncalled closures
-      constopt  27  optimization: optimize null and other constants
-           dce  28  optimization: eliminate dead code
-           jvm  29  generate JVM bytecode
-      terminal  30  the last phase during a compilation run
-#partest
+           jvm  23  generate JVM bytecode
+      terminal  24  the last phase during a compilation run
diff --git a/test/files/neg/t6952.check b/test/files/neg/t6952.check
index 1a591d02c6..acee0e7d60 100644
--- a/test/files/neg/t6952.check
+++ b/test/files/neg/t6952.check
@@ -2,7 +2,7 @@ t6952.scala:2: error: extension of type scala.Dynamic needs to be enabled
 by making the implicit value scala.language.dynamics visible.
 This can be achieved by adding the import clause 'import scala.language.dynamics'
 or by setting the compiler option -language:dynamics.
-See the Scala docs for value scala.language.dynamics for a discussion
+See the Scaladoc for value scala.language.dynamics for a discussion
 why the feature needs to be explicitly enabled.
 trait B extends Dynamic
                 ^
diff --git a/test/files/neg/t7494-no-options.check b/test/files/neg/t7494-no-options.check
index e3316f590a..a4c4a1ad5b 100644
--- a/test/files/neg/t7494-no-options.check
+++ b/test/files/neg/t7494-no-options.check
@@ -23,18 +23,6 @@ superaccessors   6  add super accessors in traits and nested classes
          mixin  20  mixin composition
        cleanup  21  platform-specific cleanups, generate reflective calls
     delambdafy  22  remove lambdas
-         icode  23  generate portable intermediate code
-#partest !-optimise
-           jvm  24  generate JVM bytecode
-       ploogin  25  A sample phase that does so many things it's kind of hard...
-      terminal  26  the last phase during a compilation run
-#partest -optimise
-       inliner  24  optimization: do inlining
-inlinehandlers  25  optimization: inline exception handlers
-      closelim  26  optimization: eliminate uncalled closures
-      constopt  27  optimization: optimize null and other constants
-           dce  28  optimization: eliminate dead code
-           jvm  29  generate JVM bytecode
-       ploogin  30  A sample phase that does so many things it's kind of hard...
-      terminal  31  the last phase during a compilation run
-#partest
+           jvm  23  generate JVM bytecode
+       ploogin  24  A sample phase that does so many things it's kind of hard...
+      terminal  25  the last phase during a compilation run
diff --git a/test/files/neg/t7622-cyclic-dependency/ThePlugin.scala b/test/files/neg/t7622-cyclic-dependency/ThePlugin.scala
index 35c0ff8f53..0734863e64 100644
--- a/test/files/neg/t7622-cyclic-dependency/ThePlugin.scala
+++ b/test/files/neg/t7622-cyclic-dependency/ThePlugin.scala
@@ -26,7 +26,7 @@ class ThePlugin(val global: Global) extends Plugin {
   private object thePhase2 extends PluginComponent {
     val global = ThePlugin.this.global
 
-    val runsAfter = List[String]("dce","cyclicdependency1")
+    val runsAfter = List[String]("jvm","cyclicdependency1")
 
     val phaseName = ThePlugin.this.name + "2"
 
diff --git a/test/files/neg/t8700a.check b/test/files/neg/t8700a.check
new file mode 100644
index 0000000000..ce7945a3fc
--- /dev/null
+++ b/test/files/neg/t8700a.check
@@ -0,0 +1,11 @@
+Bar.scala:2: warning: match may not be exhaustive.
+It would fail on the following input: B
+  def bar1(foo: Foo) = foo match {
+                       ^
+Bar.scala:6: warning: match may not be exhaustive.
+It would fail on the following input: B
+  def bar2(foo: Baz) = foo match {
+                       ^
+error: No warnings can be incurred under -Xfatal-warnings.
+two warnings found
+one error found
diff --git a/test/files/neg/t8700a.flags b/test/files/neg/t8700a.flags
new file mode 100644
index 0000000000..85d8eb2ba2
--- /dev/null
+++ b/test/files/neg/t8700a.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
diff --git a/test/files/neg/t8700a/Bar.scala b/test/files/neg/t8700a/Bar.scala
new file mode 100644
index 0000000000..33ad8e9877
--- /dev/null
+++ b/test/files/neg/t8700a/Bar.scala
@@ -0,0 +1,9 @@
+object Bar {
+  def bar1(foo: Foo) = foo match {
+    case Foo.A => 1
+  }
+
+  def bar2(foo: Baz) = foo match {
+    case Baz.A => 1
+    }
+}
diff --git a/test/files/neg/t8700a/Baz.java b/test/files/neg/t8700a/Baz.java
new file mode 100644
index 0000000000..f85ad40802
--- /dev/null
+++ b/test/files/neg/t8700a/Baz.java
@@ -0,0 +1,11 @@
+public enum Baz {
+    A {
+    	public void baz1() {}
+    },
+    B {
+        public void baz1() {}
+    };
+
+    public abstract void baz1();
+    public void baz2() {}
+}
diff --git a/test/files/neg/t8700a/Foo.java b/test/files/neg/t8700a/Foo.java
new file mode 100644
index 0000000000..cc8e9daf1f
--- /dev/null
+++ b/test/files/neg/t8700a/Foo.java
@@ -0,0 +1,4 @@
+public enum Foo {
+    A,
+    B
+}
diff --git a/test/files/neg/t8700b.check b/test/files/neg/t8700b.check
new file mode 100644
index 0000000000..3bff78dd29
--- /dev/null
+++ b/test/files/neg/t8700b.check
@@ -0,0 +1,11 @@
+Bar_2.scala:2: warning: match may not be exhaustive.
+It would fail on the following input: B
+  def bar1(foo: Foo_1) = foo match {
+                         ^
+Bar_2.scala:6: warning: match may not be exhaustive.
+It would fail on the following input: B
+  def bar2(foo: Baz_1) = foo match {
+                         ^
+error: No warnings can be incurred under -Xfatal-warnings.
+two warnings found
+one error found
diff --git a/test/files/neg/t8700b.flags b/test/files/neg/t8700b.flags
new file mode 100644
index 0000000000..85d8eb2ba2
--- /dev/null
+++ b/test/files/neg/t8700b.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
diff --git a/test/files/neg/t8700b/Bar_2.scala b/test/files/neg/t8700b/Bar_2.scala
new file mode 100644
index 0000000000..97ba16df27
--- /dev/null
+++ b/test/files/neg/t8700b/Bar_2.scala
@@ -0,0 +1,9 @@
+object Bar {
+  def bar1(foo: Foo_1) = foo match {
+    case Foo_1.A => 1
+  }
+
+  def bar2(foo: Baz_1) = foo match {
+    case Baz_1.A => 1
+    }
+}
diff --git a/test/files/neg/t8700b/Baz_1.java b/test/files/neg/t8700b/Baz_1.java
new file mode 100644
index 0000000000..6a057c2c9c
--- /dev/null
+++ b/test/files/neg/t8700b/Baz_1.java
@@ -0,0 +1,11 @@
+public enum Baz_1 {
+    A {
+    	public void baz1() {}
+    },
+    B {
+        public void baz1() {}
+    };
+
+    public abstract void baz1();
+    public void baz2() {}
+}
diff --git a/test/files/neg/t8700b/Foo_1.java b/test/files/neg/t8700b/Foo_1.java
new file mode 100644
index 0000000000..22656bdedd
--- /dev/null
+++ b/test/files/neg/t8700b/Foo_1.java
@@ -0,0 +1,4 @@
+public enum Foo_1 {
+    A,
+    B
+}
diff --git a/test/files/neg/t8736-c.check b/test/files/neg/t8736-c.check
index 06b2228543..7debb6d515 100644
--- a/test/files/neg/t8736-c.check
+++ b/test/files/neg/t8736-c.check
@@ -2,7 +2,7 @@ t8736-c.scala:4: warning: higher-kinded type should be enabled
 by making the implicit value scala.language.higherKinds visible.
 This can be achieved by adding the import clause 'import scala.language.higherKinds'
 or by setting the compiler option -language:higherKinds.
-See the Scala docs for value scala.language.higherKinds for a discussion
+See the Scaladoc for value scala.language.higherKinds for a discussion
 why the feature should be explicitly enabled.
   def hk[M[_]] = ???
          ^
diff --git a/test/files/pos/existental-slow-compile2.scala b/test/files/pos/existental-slow-compile2.scala
new file mode 100644
index 0000000000..907344982c
--- /dev/null
+++ b/test/files/pos/existental-slow-compile2.scala
@@ -0,0 +1,7 @@
+class C {
+  class L[+A]
+  def test = {
+    val foo:
+      L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: _ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: _ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_]]]]]]]]]]]]]]]]]]]]]]]]
+          = ??? } }
+
diff --git a/test/files/pos/existential-slow-compile1.flags b/test/files/pos/existential-slow-compile1.flags
new file mode 100644
index 0000000000..7f7581974d
--- /dev/null
+++ b/test/files/pos/existential-slow-compile1.flags
@@ -0,0 +1 @@
+-Ystop-after:refchecks
diff --git a/test/files/pos/existential-slow-compile1.scala b/test/files/pos/existential-slow-compile1.scala
new file mode 100644
index 0000000000..8602afd9db
--- /dev/null
+++ b/test/files/pos/existential-slow-compile1.scala
@@ -0,0 +1,7 @@
+class C {
+  type L[+A] = scala.collection.immutable.List[A]
+  def test = {
+    val foo:
+      L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: _ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: _ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_ <: L[_]]]]]]]]]]]]]]]]]]]]]]]]
+          = ??? } }
+
diff --git a/test/files/pos/inline-access-levels.flags b/test/files/pos/inline-access-levels.flags
index 9bda07eb6c..d34387c651 100644
--- a/test/files/pos/inline-access-levels.flags
+++ b/test/files/pos/inline-access-levels.flags
@@ -1 +1 @@
--optimise -Ybackend:GenASM -Xfatal-warnings -Yinline-warnings
+-Yopt:l:classpath -Xfatal-warnings -Yinline-warnings
diff --git a/test/files/pos/inliner2.flags b/test/files/pos/inliner2.flags
deleted file mode 100644
index bff4bb8afa..0000000000
--- a/test/files/pos/inliner2.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise -Ybackend:GenASM -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/inliner2.scala b/test/files/pos/inliner2.scala
deleted file mode 100644
index bc83e04312..0000000000
--- a/test/files/pos/inliner2.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-// This isn't actually testing much, because no warning is emitted in versions
-// before the fix which comes with this because the method isn't even considered
-// for inlining due to the bug.
-class A {
-  private var debug = false
-  @inline private def ifelse[T](cond: => Boolean, ifPart: => T, elsePart: => T): T =
-    if (cond) ifPart else elsePart
-
-  final def bob1() = ifelse(debug, 1, 2)
-  final def bob2() = if (debug) 1 else 2
-}
-// Cool:
-//
-// % ls -1 /tmp/2901/
-// A$$anonfun$bob1$1.class
-// A$$anonfun$bob1$2.class
-// A$$anonfun$bob1$3.class
-// A.class
-// % ls -1 /tmp/trunk
-// A.class
-//
-// Observations:
-//
-// (1) The inlined version accesses the field: the explicit one calls the accessor.
-// (2) The inlined version fails to eliminate boxing.  With reference types it emits
-//     an unneeded checkcast.
-// (3) The private var debug is mangled to A$$debug, but after inlining it is never accessed
-//     from outside of the class and doesn't need mangling.
-// (4) We could forego emitting bytecode for ifelse entirely if it has been
-//     inlined at all sites.
-//
-// Generated bytecode for the above:
-//
-// public final int bob1();
-//   Code:
-//    Stack=1, Locals=1, Args_size=1
-//    0:  aload_0
-//    1:  getfield  #11; //Field A$$debug:Z
-//    4:  ifeq  14
-//    7:  iconst_1
-//    8:  invokestatic  #41; //Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer;
-//    11: goto  18
-//    14: iconst_2
-//    15: invokestatic  #41; //Method scala/runtime/BoxesRunTime.boxToInteger:(I)Ljava/lang/Integer;
-//    18: invokestatic  #45; //Method scala/runtime/BoxesRunTime.unboxToInt:(Ljava/lang/Object;)I
-//    21: ireturn
-//
-// public final int bob2();
-//   Code:
-//    Stack=1, Locals=1, Args_size=1
-//    0:  aload_0
-//    1:  invokevirtual #48; //Method A$$debug:()Z
-//    4:  ifeq  11
-//    7:  iconst_1
-//    8:  goto  12
-//    11: iconst_2
-//    12: ireturn
diff --git a/test/files/pos/native-warning.scala b/test/files/pos/native-warning.scala
index f721a57e8f..a2918c11b5 100644
--- a/test/files/pos/native-warning.scala
+++ b/test/files/pos/native-warning.scala
@@ -1,3 +1,7 @@
 class A {
   @native def setup(): Unit
+
+  // also kosher
+  @native private def f(): Unit
+  @native final def g(): Unit
 }
diff --git a/test/files/pos/sealed-final.flags b/test/files/pos/sealed-final.flags
deleted file mode 100644
index 63f5e65527..0000000000
--- a/test/files/pos/sealed-final.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xfatal-warnings -Yinline-warnings -Ybackend:GenASM -optimise
\ No newline at end of file
diff --git a/test/files/pos/sealed-final.scala b/test/files/pos/sealed-final.scala
deleted file mode 100644
index bdedb5c1f6..0000000000
--- a/test/files/pos/sealed-final.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-sealed abstract class Foo {
-  @inline def bar(x: Int) = x + 1
-}
-object Foo {
-  def mkFoo(): Foo = new Baz2
-}
-
-object Baz1 extends Foo
-final class Baz2 extends Foo
-
-object Test {
-  // bar should be inlined now
-  def f = Foo.mkFoo() bar 10
-}
diff --git a/test/files/pos/t3234.flags b/test/files/pos/t3234.flags
new file mode 100644
index 0000000000..78726f64f7
--- /dev/null
+++ b/test/files/pos/t3234.flags
@@ -0,0 +1 @@
+-Yopt:l:project -Yinline-warnings -Xfatal-warnings
diff --git a/test/files/neg/t3234.scala b/test/files/pos/t3234.scala
index 1553f1fa05..c3b7366db8 100644
--- a/test/files/neg/t3234.scala
+++ b/test/files/pos/t3234.scala
@@ -1,7 +1,5 @@
 trait Trait1 {
-  // need more work before this one works
-  // @inline
-  def foo2(n: Int) = n*n
+  @inline def foo2(n: Int) = n*n
 }
 
 trait Trait2 {
diff --git a/test/files/pos/t3420.flags b/test/files/pos/t3420.flags
index bff4bb8afa..4fbafb7e80 100644
--- a/test/files/pos/t3420.flags
+++ b/test/files/pos/t3420.flags
@@ -1 +1 @@
--optimise -Ybackend:GenASM -Xfatal-warnings
\ No newline at end of file
+-Yopt-warnings Yopt:l:project -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/t8410.flags b/test/files/pos/t8410.flags
index 2f32e3b26a..01fc9cd3ac 100644
--- a/test/files/pos/t8410.flags
+++ b/test/files/pos/t8410.flags
@@ -1 +1 @@
--optimise -Ybackend:GenASM -Xfatal-warnings -deprecation:false -Yinline-warnings:false
+-Yopt:l:project -Xfatal-warnings -deprecation:false -Yinline-warnings:false
diff --git a/test/files/pos/t9178.flags b/test/files/pos/t9178.flags
new file mode 100644
index 0000000000..7de3c0f3ee
--- /dev/null
+++ b/test/files/pos/t9178.flags
@@ -0,0 +1 @@
+-Xfatal-warnings -deprecation
diff --git a/test/files/pos/t9178.scala b/test/files/pos/t9178.scala
new file mode 100644
index 0000000000..f2cf20a778
--- /dev/null
+++ b/test/files/pos/t9178.scala
@@ -0,0 +1,13 @@
+// eta expansion to Function0 is problematic (as shown here).
+// Perhaps we should we deprecate it? See discussion in the comments of
+// on SI-9178.
+//
+// This test encodes the status quo: no deprecation.
+object Test {
+  def foo(): () => String = () => ""
+  val f: () => Any = foo
+
+  def main(args: Array[String]): Unit = {
+    println(f()) // <function0>
+  }
+}
diff --git a/test/files/pos/t9178b.flags b/test/files/pos/t9178b.flags
new file mode 100644
index 0000000000..48fd867160
--- /dev/null
+++ b/test/files/pos/t9178b.flags
@@ -0,0 +1 @@
+-Xexperimental
diff --git a/test/files/pos/t9178b.scala b/test/files/pos/t9178b.scala
new file mode 100644
index 0000000000..cbeaed4f17
--- /dev/null
+++ b/test/files/pos/t9178b.scala
@@ -0,0 +1,7 @@
+abstract class Test{
+  val writeInput: java.io.OutputStream => Unit
+  def getOutputStream(): java.io.OutputStream
+
+  writeInput(getOutputStream)
+}
+
diff --git a/test/files/run/constant-optimization.flags b/test/files/run/constant-optimization.flags
deleted file mode 100644
index 6c9965e749..0000000000
--- a/test/files/run/constant-optimization.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise -Ybackend:GenASM
diff --git a/test/files/run/dead-code-elimination.flags b/test/files/run/dead-code-elimination.flags
deleted file mode 100644
index b9bb09167e..0000000000
--- a/test/files/run/dead-code-elimination.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimize -Ybackend:GenASM
diff --git a/test/files/run/delambdafy-specialized.check b/test/files/run/delambdafy-specialized.check
deleted file mode 100644
index c6903b9e29..0000000000
--- a/test/files/run/delambdafy-specialized.check
+++ /dev/null
@@ -1 +0,0 @@
-scala.runtime.AbstractFunction1$mcII$sp
diff --git a/test/files/run/delambdafy-specialized.flags b/test/files/run/delambdafy-specialized.flags
deleted file mode 100644
index d6278aa940..0000000000
--- a/test/files/run/delambdafy-specialized.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ydelambdafy:method -Ybackend:GenASM
diff --git a/test/files/run/delambdafy-specialized.scala b/test/files/run/delambdafy-specialized.scala
deleted file mode 100644
index 634d4e490b..0000000000
--- a/test/files/run/delambdafy-specialized.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object Test {
-  def main(args: Array[String]): Unit = {
-    val f = (x: Int) => -x
-    println(f.getClass.getSuperclass.getName)
-  }
-}
diff --git a/test/files/run/delambdafy_t6028.check b/test/files/run/delambdafy_t6028.check
index 885fc3c9f3..c8c4b1cb4c 100644
--- a/test/files/run/delambdafy_t6028.check
+++ b/test/files/run/delambdafy_t6028.check
@@ -38,10 +38,18 @@ package <empty> {
       <synthetic> <stable> <artifact> def $outer(): T = MethodLocalObject$2.this.$outer;
       <synthetic> <stable> <artifact> def $outer(): T = MethodLocalObject$2.this.$outer
     };
-    final <stable> private[this] def MethodLocalObject$1(barParam$1: String, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = {
-      MethodLocalObject$module$1.elem = new T#MethodLocalObject$2.type(T.this, barParam$1);
+    final <stable> private[this] def MethodLocalObject$lzycompute$1(barParam$1: String, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = {
+      T.this.synchronized({
+        if (MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]().eq(null))
+          MethodLocalObject$module$1.elem = new T#MethodLocalObject$2.type(T.this, barParam$1);
+        scala.runtime.BoxedUnit.UNIT
+      });
       MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]()
     };
+    final <stable> private[this] def MethodLocalObject$1(barParam$1: String, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = if (MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]().eq(null))
+      T.this.MethodLocalObject$lzycompute$1(barParam$1, MethodLocalObject$module$1)
+    else
+      MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]();
     abstract trait MethodLocalTrait$1$class extends Object with T#MethodLocalTrait$1 {
       def /*MethodLocalTrait$1$class*/$init$(barParam$1: String): Unit = {
         ()
diff --git a/test/files/run/elidable-opt.flags b/test/files/run/elidable-opt.flags
index 6537d2f57a..93fd3d5317 100644
--- a/test/files/run/elidable-opt.flags
+++ b/test/files/run/elidable-opt.flags
@@ -1 +1 @@
--optimise -Ybackend:GenASM -Xelide-below 900
+-Xelide-below 900
diff --git a/test/files/run/finalvar.flags b/test/files/run/finalvar.flags
index 8d9be3d62e..a8c7600a03 100644
--- a/test/files/run/finalvar.flags
+++ b/test/files/run/finalvar.flags
@@ -1 +1 @@
--Yoverride-vars -Yinline -Ybackend:GenASM
\ No newline at end of file
+-Yoverride-vars -Yopt:l:project
\ No newline at end of file
diff --git a/test/files/run/icode-reader-dead-code.scala b/test/files/run/icode-reader-dead-code.scala
index 535ef2a2e2..df31219dd5 100644
--- a/test/files/run/icode-reader-dead-code.scala
+++ b/test/files/run/icode-reader-dead-code.scala
@@ -36,7 +36,7 @@ object Test extends DirectTest {
 
     // If inlining fails, the compiler will issue an inliner warning that is not present in the
     // check file
-    compileString(newCompiler("-usejavacp", "-optimise", "-Ybackend:GenASM"))(bCode)
+    compileString(newCompiler("-usejavacp", "-Yopt:l:classpath"))(bCode)
   }
 
   def readClass(file: String) = {
diff --git a/test/files/run/inline-ex-handlers.check b/test/files/run/inline-ex-handlers.check
deleted file mode 100644
index 36fc2eefa4..0000000000
--- a/test/files/run/inline-ex-handlers.check
+++ /dev/null
@@ -1,492 +0,0 @@
---- a
-+++ b
-@@ -171,5 +171,5 @@
-   def productElement(x$1: Int (INT)): Object {
--  locals: value x$1, value x1
-+  locals: value x$1, value x1, variable boxed1
-   startBlock: 1
--  blocks: [1,2,3,4]
-+  blocks: [1,3,4]
-   
-@@ -186,2 +186,4 @@
-     92	LOAD_LOCAL(value x$1)
-+    92	STORE_LOCAL(variable boxed1)
-+    92	LOAD_LOCAL(variable boxed1)
-     92	BOX INT
-@@ -194,5 +196,2 @@
-     92	CALL_METHOD MyException.message (dynamic)
--    92	JUMP 2
--    
--  2: 
-     92	RETURN(REF(class Object))
-@@ -246,3 +245,3 @@
-   startBlock: 1
--  blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,17,18]
-+  blocks: [1,2,3,4,5,6,8,11,12,13,14,15,16,17,18]
-   
-@@ -257,5 +256,2 @@
-     92	SCOPE_ENTER value x1
--    92	JUMP 7
--    
--  7: 
-     92	LOAD_LOCAL(value x1)
-@@ -408,5 +404,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, value ex6, value x4, value x5, value message, value x
-+  locals: value args, variable result, value ex6, value x4, value x5, value x
-   startBlock: 1
--  blocks: [1,2,3,4,5,8,10,11,13]
-+  blocks: [1,2,3,5,8,10,11,13,14]
-   
-@@ -434,4 +430,13 @@
-     103	CALL_METHOD MyException.<init> (static-instance)
--    103	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 14
-     
-+  14: 
-+    101	LOAD_LOCAL(value ex6)
-+    101	STORE_LOCAL(value x4)
-+    101	SCOPE_ENTER value x4
-+    106	LOAD_LOCAL(value x4)
-+    106	IS_INSTANCE REF(class MyException)
-+    106	CZJUMP (BOOL)NE ? 5 : 8
-+    
-   13: 
-@@ -447,5 +452,2 @@
-     101	SCOPE_ENTER value x4
--    101	JUMP 4
--    
--  4: 
-     106	LOAD_LOCAL(value x4)
-@@ -459,8 +461,5 @@
-     106	SCOPE_ENTER value x5
--    106	LOAD_LOCAL(value x5)
--    106	CALL_METHOD MyException.message (dynamic)
--    106	STORE_LOCAL(value message)
--    106	SCOPE_ENTER value message
-     106	LOAD_MODULE object Predef
--    106	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    106	CALL_METHOD MyException.message (dynamic)
-     106	CALL_METHOD scala.Predef.println (dynamic)
-@@ -536,3 +535,3 @@
-   startBlock: 1
--  blocks: [1,2,3,4,6,7,9,10]
-+  blocks: [1,3,4,6,7,9,10,11,12,13]
-   
-@@ -565,4 +564,9 @@
-     306	CALL_METHOD MyException.<init> (static-instance)
--    306	THROW(MyException)
-+    ?	JUMP 11
-     
-+  11: 
-+    ?	LOAD_LOCAL(variable monitor4)
-+    305	MONITOR_EXIT
-+    ?	JUMP 12
-+    
-   9: 
-@@ -571,3 +575,3 @@
-     305	MONITOR_EXIT
--    ?	THROW(Throwable)
-+    ?	JUMP 12
-     
-@@ -577,4 +581,11 @@
-     304	MONITOR_EXIT
--    ?	THROW(Throwable)
-+    ?	STORE_LOCAL(value t)
-+    ?	JUMP 13
-     
-+  12: 
-+    ?	LOAD_LOCAL(variable monitor3)
-+    304	MONITOR_EXIT
-+    ?	STORE_LOCAL(value t)
-+    ?	JUMP 13
-+    
-   3: 
-@@ -591,5 +602,14 @@
-     310	CALL_METHOD scala.Predef.println (dynamic)
--    310	JUMP 2
-+    300	RETURN(UNIT)
-     
--  2: 
-+  13: 
-+    310	LOAD_MODULE object Predef
-+    310	CALL_PRIMITIVE(StartConcat)
-+    310	CONSTANT("Caught crash: ")
-+    310	CALL_PRIMITIVE(StringConcat(REF(class String)))
-+    310	LOAD_LOCAL(value t)
-+    310	CALL_METHOD java.lang.Throwable.toString (dynamic)
-+    310	CALL_PRIMITIVE(StringConcat(REF(class String)))
-+    310	CALL_PRIMITIVE(EndConcat)
-+    310	CALL_METHOD scala.Predef.println (dynamic)
-     300	RETURN(UNIT)
-@@ -601,6 +621,6 @@
-       with finalizer: null
--    catch (Throwable) in Vector(7, 9, 10) starting at: 6
-+    catch (Throwable) in Vector(7, 9, 10, 11) starting at: 6
-       consisting of blocks: List(6)
-       with finalizer: null
--    catch (Throwable) in Vector(4, 6, 7, 9, 10) starting at: 3
-+    catch (Throwable) in Vector(4, 6, 7, 9, 10, 11, 12) starting at: 3
-       consisting of blocks: List(3)
-@@ -636,3 +656,3 @@
-   startBlock: 1
--  blocks: [1,3,4,5,6,8,9]
-+  blocks: [1,3,4,5,6,8,9,10,11]
-   
-@@ -660,4 +680,10 @@
-     78	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
--    78	THROW(IllegalArgumentException)
-+    ?	STORE_LOCAL(value e)
-+    ?	JUMP 10
-     
-+  10: 
-+    81	LOAD_LOCAL(value e)
-+    ?	STORE_LOCAL(variable exc1)
-+    ?	JUMP 11
-+    
-   8: 
-@@ -686,3 +712,4 @@
-     81	LOAD_LOCAL(value e)
--    81	THROW(Exception)
-+    ?	STORE_LOCAL(variable exc1)
-+    ?	JUMP 11
-     
-@@ -703,2 +730,15 @@
-     
-+  11: 
-+    83	LOAD_MODULE object Predef
-+    83	CONSTANT("finally")
-+    83	CALL_METHOD scala.Predef.println (dynamic)
-+    84	LOAD_LOCAL(variable result)
-+    84	CONSTANT(1)
-+    84	CALL_PRIMITIVE(Arithmetic(SUB,INT))
-+    84	CONSTANT(2)
-+    84	CALL_PRIMITIVE(Arithmetic(DIV,INT))
-+    84	STORE_LOCAL(variable result)
-+    84	LOAD_LOCAL(variable exc1)
-+    84	THROW(Throwable)
-+    
-   }
-@@ -708,3 +748,3 @@
-       with finalizer: null
--    catch (<none>) in Vector(4, 5, 6, 8) starting at: 3
-+    catch (<none>) in Vector(4, 5, 6, 8, 10) starting at: 3
-       consisting of blocks: List(3)
-@@ -732,5 +772,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value message, value x, value ex6, value x4, value x5, value message, value x
-+  locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value x, value ex6, value x4, value x5, value x
-   startBlock: 1
--  blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24]
-+  blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24,25,26,27]
-   
-@@ -758,4 +798,11 @@
-     172	CALL_METHOD MyException.<init> (static-instance)
--    172	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 25
-     
-+  25: 
-+    170	LOAD_LOCAL(value ex6)
-+    170	STORE_LOCAL(value x4)
-+    170	SCOPE_ENTER value x4
-+    170	JUMP 14
-+    
-   23: 
-@@ -798,8 +845,5 @@
-     175	SCOPE_ENTER value x5
--    175	LOAD_LOCAL(value x5)
--    175	CALL_METHOD MyException.message (dynamic)
--    175	STORE_LOCAL(value message)
--    175	SCOPE_ENTER value message
-     176	LOAD_MODULE object Predef
--    176	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    176	CALL_METHOD MyException.message (dynamic)
-     176	CALL_METHOD scala.Predef.println (dynamic)
-@@ -807,5 +851,7 @@
-     177	DUP(REF(class MyException))
--    177	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    177	CALL_METHOD MyException.message (dynamic)
-     177	CALL_METHOD MyException.<init> (static-instance)
--    177	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 26
-     
-@@ -813,3 +859,4 @@
-     170	LOAD_LOCAL(value ex6)
--    170	THROW(Throwable)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 26
-     
-@@ -823,2 +870,8 @@
-     
-+  26: 
-+    169	LOAD_LOCAL(value ex6)
-+    169	STORE_LOCAL(value x4)
-+    169	SCOPE_ENTER value x4
-+    169	JUMP 5
-+    
-   5: 
-@@ -833,8 +886,5 @@
-     180	SCOPE_ENTER value x5
--    180	LOAD_LOCAL(value x5)
--    180	CALL_METHOD MyException.message (dynamic)
--    180	STORE_LOCAL(value message)
--    180	SCOPE_ENTER value message
-     181	LOAD_MODULE object Predef
--    181	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    181	CALL_METHOD MyException.message (dynamic)
-     181	CALL_METHOD scala.Predef.println (dynamic)
-@@ -842,5 +892,7 @@
-     182	DUP(REF(class MyException))
--    182	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    182	CALL_METHOD MyException.message (dynamic)
-     182	CALL_METHOD MyException.<init> (static-instance)
--    182	THROW(MyException)
-+    ?	STORE_LOCAL(variable exc2)
-+    ?	JUMP 27
-     
-@@ -848,3 +900,4 @@
-     169	LOAD_LOCAL(value ex6)
--    169	THROW(Throwable)
-+    ?	STORE_LOCAL(variable exc2)
-+    ?	JUMP 27
-     
-@@ -865,2 +918,15 @@
-     
-+  27: 
-+    184	LOAD_MODULE object Predef
-+    184	CONSTANT("finally")
-+    184	CALL_METHOD scala.Predef.println (dynamic)
-+    185	LOAD_LOCAL(variable result)
-+    185	CONSTANT(1)
-+    185	CALL_PRIMITIVE(Arithmetic(SUB,INT))
-+    185	CONSTANT(2)
-+    185	CALL_PRIMITIVE(Arithmetic(DIV,INT))
-+    185	STORE_LOCAL(variable result)
-+    185	LOAD_LOCAL(variable exc2)
-+    185	THROW(Throwable)
-+    
-   }
-@@ -870,6 +936,6 @@
-       with finalizer: null
--    catch (Throwable) in Vector(13, 14, 15, 18, 20, 21, 23) starting at: 4
-+    catch (Throwable) in Vector(13, 14, 15, 18, 20, 21, 23, 25) starting at: 4
-       consisting of blocks: List(9, 8, 6, 5, 4)
-       with finalizer: null
--    catch (<none>) in Vector(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23) starting at: 3
-+    catch (<none>) in Vector(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23, 25, 26) starting at: 3
-       consisting of blocks: List(3)
-@@ -897,5 +963,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, value e, value ex6, value x4, value x5, value message, value x
-+  locals: value args, variable result, value e, value ex6, value x4, value x5, value x
-   startBlock: 1
--  blocks: [1,2,3,6,7,8,11,13,14,16]
-+  blocks: [1,2,3,6,7,8,11,13,14,16,17]
-   
-@@ -923,4 +989,11 @@
-     124	CALL_METHOD MyException.<init> (static-instance)
--    124	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 17
-     
-+  17: 
-+    122	LOAD_LOCAL(value ex6)
-+    122	STORE_LOCAL(value x4)
-+    122	SCOPE_ENTER value x4
-+    122	JUMP 7
-+    
-   16: 
-@@ -948,8 +1021,5 @@
-     127	SCOPE_ENTER value x5
--    127	LOAD_LOCAL(value x5)
--    127	CALL_METHOD MyException.message (dynamic)
--    127	STORE_LOCAL(value message)
--    127	SCOPE_ENTER value message
-     127	LOAD_MODULE object Predef
--    127	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    127	CALL_METHOD MyException.message (dynamic)
-     127	CALL_METHOD scala.Predef.println (dynamic)
-@@ -982,3 +1052,3 @@
-       with finalizer: null
--    catch (IllegalArgumentException) in Vector(6, 7, 8, 11, 13, 14, 16) starting at: 3
-+    catch (IllegalArgumentException) in Vector(6, 7, 8, 11, 13, 14, 16, 17) starting at: 3
-       consisting of blocks: List(3)
-@@ -1006,5 +1076,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, value ex6, value x4, value x5, value message, value x, value e
-+  locals: value args, variable result, value ex6, value x4, value x5, value x, value e
-   startBlock: 1
--  blocks: [1,2,3,4,5,8,12,13,14,16]
-+  blocks: [1,2,3,5,8,12,13,14,16,17]
-   
-@@ -1032,4 +1102,13 @@
-     148	CALL_METHOD MyException.<init> (static-instance)
--    148	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 17
-     
-+  17: 
-+    145	LOAD_LOCAL(value ex6)
-+    145	STORE_LOCAL(value x4)
-+    145	SCOPE_ENTER value x4
-+    154	LOAD_LOCAL(value x4)
-+    154	IS_INSTANCE REF(class MyException)
-+    154	CZJUMP (BOOL)NE ? 5 : 8
-+    
-   16: 
-@@ -1053,5 +1132,2 @@
-     145	SCOPE_ENTER value x4
--    145	JUMP 4
--    
--  4: 
-     154	LOAD_LOCAL(value x4)
-@@ -1065,8 +1141,5 @@
-     154	SCOPE_ENTER value x5
--    154	LOAD_LOCAL(value x5)
--    154	CALL_METHOD MyException.message (dynamic)
--    154	STORE_LOCAL(value message)
--    154	SCOPE_ENTER value message
-     154	LOAD_MODULE object Predef
--    154	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    154	CALL_METHOD MyException.message (dynamic)
-     154	CALL_METHOD scala.Predef.println (dynamic)
-@@ -1287,3 +1360,3 @@
-   startBlock: 1
--  blocks: [1,2,3,4,5,7]
-+  blocks: [1,2,3,4,5,7,8]
-   
-@@ -1311,4 +1384,11 @@
-     38	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
--    38	THROW(IllegalArgumentException)
-+    ?	STORE_LOCAL(value e)
-+    ?	JUMP 8
-     
-+  8: 
-+    42	LOAD_MODULE object Predef
-+    42	CONSTANT("IllegalArgumentException")
-+    42	CALL_METHOD scala.Predef.println (dynamic)
-+    42	JUMP 2
-+    
-   7: 
-@@ -1358,5 +1438,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, value ex6, value x4, value x5, value message, value x
-+  locals: value args, variable result, value ex6, value x4, value x5, value x
-   startBlock: 1
--  blocks: [1,2,3,4,5,8,10,11,13,14,16]
-+  blocks: [1,2,3,5,8,10,11,13,14,16,17]
-   
-@@ -1384,3 +1464,4 @@
-     203	CALL_METHOD MyException.<init> (static-instance)
--    203	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 17
-     
-@@ -1404,4 +1485,13 @@
-     209	CALL_METHOD MyException.<init> (static-instance)
--    209	THROW(MyException)
-+    ?	STORE_LOCAL(value ex6)
-+    ?	JUMP 17
-     
-+  17: 
-+    200	LOAD_LOCAL(value ex6)
-+    200	STORE_LOCAL(value x4)
-+    200	SCOPE_ENTER value x4
-+    212	LOAD_LOCAL(value x4)
-+    212	IS_INSTANCE REF(class MyException)
-+    212	CZJUMP (BOOL)NE ? 5 : 8
-+    
-   16: 
-@@ -1417,5 +1507,2 @@
-     200	SCOPE_ENTER value x4
--    200	JUMP 4
--    
--  4: 
-     212	LOAD_LOCAL(value x4)
-@@ -1429,8 +1516,5 @@
-     212	SCOPE_ENTER value x5
--    212	LOAD_LOCAL(value x5)
--    212	CALL_METHOD MyException.message (dynamic)
--    212	STORE_LOCAL(value message)
--    212	SCOPE_ENTER value message
-     213	LOAD_MODULE object Predef
--    213	LOAD_LOCAL(value message)
-+    ?	LOAD_LOCAL(value x5)
-+    213	CALL_METHOD MyException.message (dynamic)
-     213	CALL_METHOD scala.Predef.println (dynamic)
-@@ -1478,3 +1562,3 @@
-   startBlock: 1
--  blocks: [1,2,3,4,5,7]
-+  blocks: [1,2,3,4,5,7,8]
-   
-@@ -1502,4 +1586,11 @@
-     58	CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance)
--    58	THROW(IllegalArgumentException)
-+    ?	STORE_LOCAL(value e)
-+    ?	JUMP 8
-     
-+  8: 
-+    62	LOAD_MODULE object Predef
-+    62	CONSTANT("RuntimeException")
-+    62	CALL_METHOD scala.Predef.println (dynamic)
-+    62	JUMP 2
-+    
-   7: 
-@@ -1551,3 +1642,3 @@
-   startBlock: 1
--  blocks: [1,3,4]
-+  blocks: [1,3,4,5]
-   
-@@ -1571,4 +1662,9 @@
-     229	CALL_METHOD MyException.<init> (static-instance)
--    229	THROW(MyException)
-+    ?	JUMP 5
-     
-+  5: 
-+    ?	LOAD_LOCAL(variable monitor1)
-+    228	MONITOR_EXIT
-+    228	THROW(Throwable)
-+    
-   3: 
-@@ -1577,3 +1673,3 @@
-     228	MONITOR_EXIT
--    ?	THROW(Throwable)
-+    228	THROW(Throwable)
-     
-@@ -1605,5 +1701,5 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, variable result, variable monitor2, variable monitorResult1
-+  locals: value exception$1, value args, variable result, variable monitor2, variable monitorResult1
-   startBlock: 1
--  blocks: [1,3,4]
-+  blocks: [1,3,4,5]
-   
-@@ -1630,4 +1726,12 @@
-     245	CALL_METHOD MyException.<init> (static-instance)
--    245	THROW(MyException)
-+    ?	STORE_LOCAL(value exception$1)
-+    ?	DROP ConcatClass
-+    ?	LOAD_LOCAL(value exception$1)
-+    ?	JUMP 5
-     
-+  5: 
-+    ?	LOAD_LOCAL(variable monitor2)
-+    244	MONITOR_EXIT
-+    244	THROW(Throwable)
-+    
-   3: 
-@@ -1636,3 +1740,3 @@
-     244	MONITOR_EXIT
--    ?	THROW(Throwable)
-+    244	THROW(Throwable)
-     
diff --git a/test/files/run/inline-ex-handlers.scala b/test/files/run/inline-ex-handlers.scala
deleted file mode 100644
index 4095d54e36..0000000000
--- a/test/files/run/inline-ex-handlers.scala
+++ /dev/null
@@ -1,329 +0,0 @@
-import scala.tools.partest.IcodeComparison
-
-object Test extends IcodeComparison {
-  override def printIcodeAfterPhase = "inlinehandlers"; override def extraSettings: String = super.extraSettings + " -Ybackend:GenASM" // same line to minimize check file changs
-}
-
-import scala.util.Random._
-
-/** There should be no inlining taking place in this class */
-object TestInlineHandlersNoInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersNoInline")
-    var result = -1
-
-    try {
-      if (nextInt % 2 == 0)
-      throw new IllegalArgumentException("something")
-      result = 1
-    } catch {
-      case e: StackOverflowError =>
-      println("Stack overflow")
-    }
-
-    result
-  }
-}
-
-/** Just a simple inlining should take place in this class */
-object TestInlineHandlersSimpleInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSimpleInline")
-    var result = -1
-
-    try {
-      if (nextInt % 2 == 0)
-      throw new IllegalArgumentException("something")
-      result = 1
-    } catch {
-      case e: IllegalArgumentException =>
-      println("IllegalArgumentException")
-    }
-
-    result
-  }
-}
-
-/** Inlining should take place because the handler is taking a superclass of the exception thrown */
-object TestInlineHandlersSubclassInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSubclassInline")
-    var result = -1
-
-    try {
-      if (nextInt % 2 == 0)
-      throw new IllegalArgumentException("something")
-      result = 1
-    } catch {
-      case e: RuntimeException =>
-      println("RuntimeException")
-    }
-
-    result
-  }
-}
-
-/** For this class, the finally handler should be inlined */
-object TestInlineHandlersFinallyInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersFinallyInline")
-    var result = -1
-
-    try {
-      if (nextInt % 2 == 0)
-      throw new IllegalArgumentException("something")
-      result = 1
-    } catch {
-      case e: Exception => throw e
-    } finally {
-      println("finally")
-      result = (result - 1) / 2
-    }
-
-    result
-  }
-}
-
-
-case class MyException(message: String) extends RuntimeException(message)
-
-/** For this class, we test inlining for a case class error */
-object TestInlineHandlersCaseClassExceptionInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersCaseClassExceptionInline")
-    var result = -1
-
-    try {
-      if (nextInt % 2 == 0)
-      throw new MyException("something")
-      result = 1
-    } catch {
-      case MyException(message) => println(message)
-    }
-
-    result
-  }
-}
-
-
-/** For this class, inline should take place in the inner handler */
-object TestInlineHandlersNestedHandlerInnerInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersNestedHandlersInnerInline")
-    var result = -1
-
-    try {
-      try {
-        if (nextInt % 2 == 0)
-        throw new MyException("something")
-        result = 1
-      } catch {
-        case MyException(message) => println(message)
-      }
-    } catch {
-      case e: IllegalArgumentException => println("IllegalArgumentException")
-    }
-
-    result
-  }
-}
-
-
-/** For this class, inline should take place in the outer handler */
-object TestInlineHandlersNestedHandlerOuterInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersNestedHandlersOuterInline")
-    var result = -1
-
-    try {
-      try {
-        if (nextInt % 2 == 0)
-        throw new MyException("something")
-        result = 1
-      } catch {
-        case e: IllegalArgumentException => println("IllegalArgumentException")
-      }
-    } catch {
-      case MyException(message) => println(message)
-    }
-
-    result
-  }
-}
-
-
-/** For this class, inline should take place in the all handlers (inner, outer and finally) */
-object TestInlineHandlersNestedHandlerAllInline {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersNestedHandlersOuterInline")
-    var result = -1
-
-    try {
-      try {
-        if (nextInt % 2 == 0)
-        throw new MyException("something")
-        result = 1
-      } catch {
-        case MyException(message) =>
-        println(message)
-        throw MyException(message)
-      }
-    } catch {
-      case MyException(message) =>
-      println(message)
-      throw MyException(message)
-    } finally {
-      println("finally")
-      result = (result - 1) / 2
-    }
-
-    result
-  }
-}
-
-
-/** This class is meant to test whether the inline handler is copied only once for multiple inlines */
-object TestInlineHandlersSingleCopy {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSingleCopy")
-    var result = -1
-
-    try {
-
-      if (nextInt % 2 == 0)
-      throw new MyException("something")
-
-      println("A side effect in the middle")
-      result = 3 // another one
-
-      if (nextInt % 3 == 2)
-      throw new MyException("something else")
-      result = 1
-    } catch {
-      case MyException(message) =>
-      println(message)
-    }
-
-    result
-  }
-}
-
-/** This should test the special exception handler for synchronized blocks */
-object TestInlineHandlersSynchronized {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSynchronized")
-    var result = "hello"
-
-    // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :)
-    result.synchronized {
-      throw MyException(result)
-    }
-
-    result.length
-  }
-}
-
-/** This should test the special exception handler for synchronized blocks with stack */
-object TestInlineHandlersSynchronizedWithStack {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSynchronizedWithStack")
-    var result = "hello"
-
-    // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :)
-    result = "abc" + result.synchronized {
-      throw MyException(result)
-    }
-
-    result.length
-  }
-}
-
-/** This test should trigger a bug in the dead code elimination phase - it actually crashes ICodeCheckers
-object TestInlineHandlersSynchronizedWithStackDoubleThrow {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersSynchronizedWithStackDoubleThrow")
-    var result = "a"
-
-    // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :)
-    result += result.synchronized { throw MyException(result) }
-    result += result.synchronized { throw MyException(result) }
-
-    result.length
-  }
-}
-*/
-
-/** This test should check the preciseness of the inliner: it should not do any inlining here
-* as it is not able to discern between the different exceptions
-*/
-object TestInlineHandlersPreciseness {
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersCorrectHandler")
-
-    try {
-      val exception: Throwable =
-      if (scala.util.Random.nextInt % 2 == 0)
-      new IllegalArgumentException("even")
-      else
-      new StackOverflowError("odd")
-      throw exception
-    } catch {
-      case e: IllegalArgumentException =>
-      println("Correct, IllegalArgumentException")
-      case e: StackOverflowError =>
-      println("Correct, StackOverflowException")
-      case t: Throwable =>
-      println("WROOOONG, not Throwable!")
-    }
-  }
-}
-
-/** This check should verify that the double no-local exception handler is duplicated correctly */
-object TestInlineHandlersDoubleNoLocal {
-
-  val a1: String = "a"
-  val a2: String = "b"
-
-  def main(args: Array[String]): Unit = {
-    println("TestInlineHandlersDoubleNoLocal")
-
-    try {
-      a1.synchronized {
-        a2. synchronized {
-          throw new MyException("crash")
-        }
-      }
-    } catch {
-      case t: Throwable => println("Caught crash: " + t.toString)
-    }
-
-    /*        try {
-      val exception: Throwable =
-      if (scala.util.Random.nextInt % 2 == 0)
-      new IllegalArgumentException("even")
-      else
-      new StackOverflowError("odd")
-      throw exception
-    } catch {
-      case e: IllegalArgumentException =>
-      println("Correct, IllegalArgumentException")
-      case e: StackOverflowError =>
-      println("Correct, StackOverflowException")
-      case t: Throwable =>
-      println("WROOOONG, not Throwable!")
-    }*/
-  }
-}
diff --git a/test/files/run/optimizer-array-load.flags b/test/files/run/optimizer-array-load.flags
deleted file mode 100644
index 99bd6c895d..0000000000
--- a/test/files/run/optimizer-array-load.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise -Ybackend:GenASM
\ No newline at end of file
diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check
index 1cd94ccb45..280a4f43d5 100644
--- a/test/files/run/programmatic-main.check
+++ b/test/files/run/programmatic-main.check
@@ -22,6 +22,5 @@ superaccessors   6  add super accessors in traits and nested classes
          mixin  20  mixin composition
        cleanup  21  platform-specific cleanups, generate reflective calls
     delambdafy  22  remove lambdas
-         icode  23  generate portable intermediate code
-           jvm  24  generate JVM bytecode
-      terminal  25  the last phase during a compilation run
+           jvm  23  generate JVM bytecode
+      terminal  24  the last phase during a compilation run
diff --git a/test/files/run/sbt-icode-interface.scala b/test/files/run/sbt-icode-interface.scala
index 84d38cc65a..7cd2de5c00 100644
--- a/test/files/run/sbt-icode-interface.scala
+++ b/test/files/run/sbt-icode-interface.scala
@@ -9,34 +9,32 @@ object Test extends DirectTest {
   """.trim
 
   def show() {
-    for (b <- List("GenASM", "GenBCode")) {
-      val global = newCompiler("-usejavacp", s"-Ybackend:$b")
-      import global._
-      val r = new Run
-      r.compileSources(newSourceFile(code) :: Nil)
-      
-      val results = collection.mutable.Buffer[(Boolean, String)]()
+    val global = newCompiler("-usejavacp")
+    import global._
+    val r = new Run
+    r.compileSources(newSourceFile(code) :: Nil)
 
-      // Nailing down defacto compiler API from SBT's usage
-      // https://github.com/sbt/sbt/blob/adb41611cf73260938274915d8462d924df200c8/compile/interface/src/main/scala/xsbt/Analyzer.scala#L29-L41
-      def isTopLevelModule(sym: Symbol) = sym.isTopLevel && sym.isModule
-      for (unit <- currentRun.units if !unit.isJava) {
-        val sourceFile = unit.source.file.file
-        for (iclass <- unit.icode) {
-          val sym = iclass.symbol
-          def addGenerated(separatorRequired: Boolean) {
-            results += (separatorRequired -> sym.fullName)
-          }
-          if (sym.isModuleClass && !sym.isImplClass) {
-            if (isTopLevelModule(sym) && sym.companionClass == NoSymbol)
-              addGenerated(false)
-            addGenerated(true)
-          } else
-            addGenerated(false)
+    val results = collection.mutable.Buffer[(Boolean, String)]()
+
+    // Nailing down defacto compiler API from SBT's usage
+    // https://github.com/sbt/sbt/blob/adb41611cf73260938274915d8462d924df200c8/compile/interface/src/main/scala/xsbt/Analyzer.scala#L29-L41
+    def isTopLevelModule(sym: Symbol) = sym.isTopLevel && sym.isModule
+    for (unit <- currentRun.units if !unit.isJava) {
+      val sourceFile = unit.source.file.file
+      for (iclass <- unit.icode) {
+        val sym = iclass.symbol
+        def addGenerated(separatorRequired: Boolean) {
+          results += (separatorRequired -> sym.fullName)
         }
+        if (sym.isModuleClass && !sym.isImplClass) {
+          if (isTopLevelModule(sym) && sym.companionClass == NoSymbol)
+            addGenerated(false)
+          addGenerated(true)
+        } else
+          addGenerated(false)
       }
-      val expected = List((false, "C"), (true, "O"), (false, "C$D"))
-      assert(results.toList == expected, b + ": " + results.toList)
     }
+    val expected = List((false, "C"), (true, "O"), (false, "C$D"))
+    assert(results.toList == expected, s"expected: $expected, actual: ${results.toList}")
   }
 }
diff --git a/test/files/run/showraw_tree_types_ids.check b/test/files/run/showraw_tree_types_ids.check
index 75347463cb..e122148040 100644
--- a/test/files/run/showraw_tree_types_ids.check
+++ b/test/files/run/showraw_tree_types_ids.check
@@ -4,9 +4,9 @@ Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](sca
 [3] TypeRef(ThisType(scala.collection.immutable#<id>), scala.collection.immutable.HashMap#<id>, List())
 [4] TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List())
 [5] SingleType(ThisType(scala#<id>), scala.Predef#<id>)
-Apply[6](Select[7](New[6](TypeTree[6]().setOriginal(AppliedTypeTree(Ident[8](scala.collection.mutable.HashMap#<id>), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>), TypeName("String")#<id>)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>), TypeName("String")#<id>)))))), termNames.CONSTRUCTOR#<id>), List())
+Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.mutable.HashMap#<id>), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>), TypeName("String")#<id>)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>), TypeName("String")#<id>)))))), termNames.CONSTRUCTOR#<id>), List())
+[1] TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List(TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()), TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List())))
+[2] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List(TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()), TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()))))
+[3] TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List())
 [4] TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List())
 [5] SingleType(ThisType(scala#<id>), scala.Predef#<id>)
-[6] TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List(TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()), TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List())))
-[7] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List(TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()), TypeRef(SingleType(ThisType(scala#<id>), scala.Predef#<id>), TypeName("String")#<id>, List()))))
-[8] TypeRef(ThisType(scala.collection.mutable#<id>), scala.collection.mutable.HashMap#<id>, List())
diff --git a/test/files/run/showraw_tree_types_typed.check b/test/files/run/showraw_tree_types_typed.check
index de691e369e..4934ed41dc 100644
--- a/test/files/run/showraw_tree_types_typed.check
+++ b/test/files/run/showraw_tree_types_typed.check
@@ -4,9 +4,9 @@ Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](sca
 [3] TypeRef(ThisType(scala.collection.immutable), scala.collection.immutable.HashMap, List())
 [4] TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List())
 [5] SingleType(ThisType(scala), scala.Predef)
-Apply[6](Select[7](New[6](TypeTree[6]().setOriginal(AppliedTypeTree(Ident[8](scala.collection.mutable.HashMap), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef), TypeName("String"))), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef), TypeName("String"))))))), termNames.CONSTRUCTOR), List())
+Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.mutable.HashMap), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef), TypeName("String"))), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef), TypeName("String"))))))), termNames.CONSTRUCTOR), List())
+[1] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()), TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List())))
+[2] MethodType(List(), TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()), TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()))))
+[3] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List())
 [4] TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List())
 [5] SingleType(ThisType(scala), scala.Predef)
-[6] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()), TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List())))
-[7] MethodType(List(), TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List(TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()), TypeRef(SingleType(ThisType(scala), scala.Predef), TypeName("String"), List()))))
-[8] TypeRef(ThisType(scala.collection.mutable), scala.collection.mutable.HashMap, List())
diff --git a/test/files/run/showraw_tree_ultimate.check b/test/files/run/showraw_tree_ultimate.check
index 81efcc05ab..b94d568a75 100644
--- a/test/files/run/showraw_tree_ultimate.check
+++ b/test/files/run/showraw_tree_ultimate.check
@@ -4,9 +4,9 @@ Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](sca
 [3] TypeRef(ThisType(scala.collection.immutable#<id>#PKC), scala.collection.immutable.HashMap#<id>#CLS, List())
 [4] TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List())
 [5] SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD)
-Apply[6](Select[7](New[6](TypeTree[6]().setOriginal(AppliedTypeTree(Ident[8](scala.collection.mutable.HashMap#<id>#CLS), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE)))))), termNames.CONSTRUCTOR#<id>#CTOR), List())
+Apply[1](Select[2](New[1](TypeTree[1]().setOriginal(AppliedTypeTree(Ident[3](scala.collection.mutable.HashMap#<id>#CLS), List(TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE)), TypeTree[4]().setOriginal(Select[4](Ident[5](scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE)))))), termNames.CONSTRUCTOR#<id>#CTOR), List())
+[1] TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List(TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()), TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List())))
+[2] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List(TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()), TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()))))
+[3] TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List())
 [4] TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List())
 [5] SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD)
-[6] TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List(TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()), TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List())))
-[7] MethodType(List(), TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List(TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()), TypeRef(SingleType(ThisType(scala#<id>#PKC), scala.Predef#<id>#MOD), TypeName("String")#<id>#TPE, List()))))
-[8] TypeRef(ThisType(scala.collection.mutable#<id>#PKC), scala.collection.mutable.HashMap#<id>#CLS, List())
diff --git a/test/files/run/synchronized.flags b/test/files/run/synchronized.flags
index b9bb09167e..19c578e4ad 100644
--- a/test/files/run/synchronized.flags
+++ b/test/files/run/synchronized.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:project
diff --git a/test/files/run/t3509.flags b/test/files/run/t3509.flags
index 9c59981aa9..422d6be431 100644
--- a/test/files/run/t3509.flags
+++ b/test/files/run/t3509.flags
@@ -1 +1 @@
--Yinline -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t3569.flags b/test/files/run/t3569.flags
index 9c59981aa9..422d6be431 100644
--- a/test/files/run/t3569.flags
+++ b/test/files/run/t3569.flags
@@ -1 +1 @@
--Yinline -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t3647.check b/test/files/run/t3647.check
new file mode 100644
index 0000000000..e5c1ee1701
--- /dev/null
+++ b/test/files/run/t3647.check
@@ -0,0 +1 @@
+warning: there were three deprecation warnings; re-run with -deprecation for details
diff --git a/test/files/run/t4285.flags b/test/files/run/t4285.flags
index 99bd6c895d..422d6be431 100644
--- a/test/files/run/t4285.flags
+++ b/test/files/run/t4285.flags
@@ -1 +1 @@
--optimise -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t4935.flags b/test/files/run/t4935.flags
index b9bb09167e..65caa3736e 100644
--- a/test/files/run/t4935.flags
+++ b/test/files/run/t4935.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:classpath
diff --git a/test/files/run/t4950.check b/test/files/run/t4950.check
deleted file mode 100644
index 8994441163..0000000000
--- a/test/files/run/t4950.check
+++ /dev/null
@@ -1,7 +0,0 @@
-
-scala> val 1 = 2
-scala.MatchError: 2 (of class java.lang.Integer)
-
-scala> val List(1) = List(1)
-
-scala> :quit
diff --git a/test/files/run/t4950.scala b/test/files/run/t4950.scala
index cef06027bf..e34b2cf3f2 100644
--- a/test/files/run/t4950.scala
+++ b/test/files/run/t4950.scala
@@ -1,12 +1,24 @@
-import scala.tools.partest.ReplTest
+import scala.tools.partest.SessionTest
+import scala.PartialFunction.{ cond => when }
+
+object Elision {
+  val elideMsg = """  ... \d+ elided""".r
+}
+
+object Test extends SessionTest {
+  import Elision._
 
-object Test extends ReplTest {
   // Filter out the abbreviated stacktrace "... X elided" 
   // because the number seems to differ between versions/platforms/...
-  override def show = eval() filterNot (_ contains "elided") foreach println
-  def code =
+  def elided(s: String) = when(s) { case elideMsg() => true }
+  override def eval() = super.eval() filterNot elided
+  def session =
 """
-val 1 = 2
-val List(1) = List(1)
+scala> val 1 = 2
+scala.MatchError: 2 (of class java.lang.Integer)
+
+scala> val List(1) = List(1)
+
+scala> :quit
 """
 }
diff --git a/test/files/run/t5313.check b/test/files/run/t5313.check
deleted file mode 100644
index 7a48b2b711..0000000000
--- a/test/files/run/t5313.check
+++ /dev/null
@@ -1,12 +0,0 @@
-STORE_LOCAL(variable kept1)
-STORE_LOCAL(value result)
-STORE_LOCAL(variable kept1)
-STORE_LOCAL(variable kept2)
-STORE_LOCAL(value kept3)
-STORE_LOCAL(variable kept2)
-STORE_LOCAL(variable kept4)
-STORE_LOCAL(variable kept4)
-STORE_LOCAL(variable kept5)
-STORE_LOCAL(variable kept5)
-STORE_LOCAL(variable kept6)
-STORE_LOCAL(variable kept6)
diff --git a/test/files/run/t5313.scala b/test/files/run/t5313.scala
deleted file mode 100644
index 24ed334816..0000000000
--- a/test/files/run/t5313.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-import scala.tools.partest.IcodeComparison
-
-object Test extends IcodeComparison {
-  override def printIcodeAfterPhase = "dce"
-
-  override def extraSettings: String = super.extraSettings + " -optimize -Ybackend:GenASM"
-
-  override def code =
-    """class Foo {
-      def randomBoolean = scala.util.Random.nextInt % 2 == 0
-      def bar = {
-        var kept1 = new Object
-        val result = new java.lang.ref.WeakReference(kept1)
-        kept1 = null // we can't eliminate this assignment because result can observe
-                   // when the object has no more references. See SI-5313
-        kept1 = new Object // but we can eliminate this one because kept1 has already been clobbered
-        var erased2 = null // we can eliminate this store because it's never used
-        val erased3 = erased2 // and this
-        var erased4 = erased2 // and this
-        val erased5 = erased4 // and this
-        var kept2: Object = new Object // ultimately can't be eliminated
-        while(randomBoolean) {
-          val kept3 = kept2
-          kept2 = null // this can't, because it clobbers kept2, which is used
-          erased4 = null // safe to eliminate
-          println(kept3)
-        }
-        var kept4 = new Object // have to keep, it's used
-        try
-          println(kept4)
-        catch {
-          case _ : Throwable => kept4 = null // have to keep, it clobbers kept4 which is used
-        }
-        var kept5 = new Object
-        print(kept5)
-        kept5 = null // can't eliminate it's a clobber and it's used
-        print(kept5)
-        kept5 = null // can eliminate because we don't care about clobbers of nulls
-        while(randomBoolean) {
-          var kept6: AnyRef = null // not used, but have to keep because it clobbers the next used store
-                                   // on the back edge of the loop
-          kept6 = new Object // used
-          println(kept6)
-        }
-        result
-      }
-    }""".stripMargin
-
-  override def show() {
-    val storeLocal = "STORE_LOCAL"
-    val lines1 = collectIcode() filter (_ contains storeLocal) map (x => x.drop(x.indexOf(storeLocal)))
-    println(lines1 mkString "\n")
-  }
-}
diff --git a/test/files/run/t5789.scala b/test/files/run/t5789.scala
index c8d95f2153..677c9ca229 100644
--- a/test/files/run/t5789.scala
+++ b/test/files/run/t5789.scala
@@ -5,7 +5,7 @@ import scala.tools.partest.ReplTest
 
 
 object Test extends ReplTest {
-  override def extraSettings = "-Yinline -Ybackend:GenASM"
+  override def extraSettings = "-Yopt:l:classpath"
   def code = """
     val n = 2
     () => n
diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check
index a768f32976..b3d20a9902 100644
--- a/test/files/run/t6028.check
+++ b/test/files/run/t6028.check
@@ -50,10 +50,18 @@ package <empty> {
       <synthetic> <stable> <artifact> def $outer(): T = MethodLocalObject$2.this.$outer;
       <synthetic> <stable> <artifact> def $outer(): T = MethodLocalObject$2.this.$outer
     };
-    final <stable> private[this] def MethodLocalObject$1(barParam$1: Int, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = {
-      MethodLocalObject$module$1.elem = new T#MethodLocalObject$2.type(T.this, barParam$1);
+    final <stable> private[this] def MethodLocalObject$lzycompute$1(barParam$1: Int, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = {
+      T.this.synchronized({
+        if (MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]().eq(null))
+          MethodLocalObject$module$1.elem = new T#MethodLocalObject$2.type(T.this, barParam$1);
+        scala.runtime.BoxedUnit.UNIT
+      });
       MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]()
     };
+    final <stable> private[this] def MethodLocalObject$1(barParam$1: Int, MethodLocalObject$module$1: runtime.VolatileObjectRef): T#MethodLocalObject$2.type = if (MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]().eq(null))
+      T.this.MethodLocalObject$lzycompute$1(barParam$1, MethodLocalObject$module$1)
+    else
+      MethodLocalObject$module$1.elem.$asInstanceOf[T#MethodLocalObject$2.type]();
     abstract trait MethodLocalTrait$1$class extends Object with T#MethodLocalTrait$1 {
       def /*MethodLocalTrait$1$class*/$init$(barParam$1: Int): Unit = {
         ()
diff --git a/test/files/run/t6188.flags b/test/files/run/t6188.flags
index b9bb09167e..422d6be431 100644
--- a/test/files/run/t6188.flags
+++ b/test/files/run/t6188.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t6288.check b/test/files/run/t6288.check
index a032a10de6..67877fd56d 100644
--- a/test/files/run/t6288.check
+++ b/test/files/run/t6288.check
@@ -33,11 +33,8 @@
       [175]case <synthetic> val x1: [175]Any = [175]"";
       [175]case5()[195]{
         [195]<synthetic> val o7: [195]Option[List[Int]] = [195][195]Case4.unapplySeq([195]x1);
-        [195]if ([195]o7.isEmpty.unary_!)
-          [195]if ([195][195][195][195]o7.get.!=([195]null).&&([195][195][195][195]o7.get.lengthCompare([195]1).==([195]0)))
-            [208][208]matchEnd4([208]())
-          else
-            [195][195]case6()
+        [195]if ([195][195]o7.isEmpty.unary_!.&&([195][195][195][195]o7.get.!=([195]null).&&([195][195][195][195]o7.get.lengthCompare([195]1).==([195]0))))
+          [208][208]matchEnd4([208]())
         else
           [195][195]case6()
       };
@@ -59,11 +56,8 @@
       [273]case <synthetic> val x1: [273]Any = [273]"";
       [273]case5()[293]{
         [293]<synthetic> val o7: [293]Option[List[Int]] = [293][293]Case4.unapplySeq([293]x1);
-        [293]if ([293]o7.isEmpty.unary_!)
-          [293]if ([293][293][293][293]o7.get.!=([293]null).&&([293][293][293][293]o7.get.lengthCompare([293]0).==([293]0)))
-            [304][304]matchEnd4([304]())
-          else
-            [293][293]case6()
+        [293]if ([293][293]o7.isEmpty.unary_!.&&([293][293][293][293]o7.get.!=([293]null).&&([293][293][293][293]o7.get.lengthCompare([293]0).==([293]0))))
+          [304][304]matchEnd4([304]())
         else
           [293][293]case6()
       };
diff --git a/test/files/run/t6546.flags b/test/files/run/t6546.flags
deleted file mode 100644
index 6015e7c61f..0000000000
--- a/test/files/run/t6546.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ybackend:GenASM -optimise
\ No newline at end of file
diff --git a/test/files/run/t6546/A_1.scala b/test/files/run/t6546/A_1.scala
deleted file mode 100644
index bd086c08f8..0000000000
--- a/test/files/run/t6546/A_1.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-final class Opt {
-  @inline def getOrElse(x: => String): String = ""
-}
-class A_1 {
-  def f(x: Opt): String = x getOrElse null
-}
diff --git a/test/files/run/t6546/B_2.scala b/test/files/run/t6546/B_2.scala
deleted file mode 100644
index 64ec966f75..0000000000
--- a/test/files/run/t6546/B_2.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.tools.partest.BytecodeTest
-
-object Test extends BytecodeTest {
-  def show: Unit = {
-    val node = loadClassNode("A_1")
-    assert(node.innerClasses.isEmpty, node.innerClasses)
-  }
-}
diff --git a/test/files/run/t6955.scala b/test/files/run/t6955.scala
deleted file mode 100644
index 9ee3ef6bc5..0000000000
--- a/test/files/run/t6955.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-import scala.tools.partest.IcodeComparison
-
-// this class should compile to code that uses switches (twice)
-class Switches {
-  type Tag = Byte
-
-  def switchBad(i: Tag): Int = i match { // notice type of i is Tag = Byte
-    case 1 => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-
-  // this worked before, should keep working
-  def switchOkay(i: Byte): Int = i match {
-    case 1 => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-}
-
-object Test extends IcodeComparison {
-  override def extraSettings: String = super.extraSettings + " -Ybackend:GenASM"
-
-  // ensure we get two switches out of this -- ignore the rest of the output for robustness
-  // exclude the constant we emit for the "SWITCH ..." string below (we get the icode for all the code you see in this file)
-  override def show() = {
-    val expected = 2
-    val actual = (collectIcode() filter {
-      x => x.indexOf("SWITCH ...") >= 0 && x.indexOf("CONSTANT(") == -1
-    }).size
-    assert(actual == expected)
-  }
-}
-
diff --git a/test/files/run/t6956.scala b/test/files/run/t6956.scala
deleted file mode 100644
index 594f5c9194..0000000000
--- a/test/files/run/t6956.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-import scala.tools.partest.IcodeComparison
-
-class Switches {
-  private[this] final val ONE = 1
-
-  def switchBad(i: Byte): Int = i match {
-    case ONE => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-
-  def switchOkay(i: Byte): Int = i match {
-    case 1 => 1
-    case 2 => 2
-    case 3 => 3
-    case _ => 0
-  }
-}
-
-object Test extends IcodeComparison {
-  override def extraSettings: String = super.extraSettings + " -Ybackend:GenASM"
-
-  // ensure we get two switches out of this -- ignore the rest of the output for robustness
-  // exclude the constant we emit for the "SWITCH ..." string below (we get the icode for all the code you see in this file)
-  override def show() = {
-    val expected = 2
-    val actual = (collectIcode() filter {
-      x => x.indexOf("SWITCH ...") >= 0 && x.indexOf("CONSTANT(") == -1
-    }).size
-    assert(actual == expected)
-  }
-}
diff --git a/test/files/run/t7008-scala-defined.flags b/test/files/run/t7008-scala-defined.flags
index 49f2d2c4c8..e69de29bb2 100644
--- a/test/files/run/t7008-scala-defined.flags
+++ b/test/files/run/t7008-scala-defined.flags
@@ -1 +0,0 @@
--Ybackend:GenASM
diff --git a/test/files/run/t7459b-optimize.flags b/test/files/run/t7459b-optimize.flags
index b9bb09167e..65caa3736e 100644
--- a/test/files/run/t7459b-optimize.flags
+++ b/test/files/run/t7459b-optimize.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:classpath
diff --git a/test/files/run/t7582.flags b/test/files/run/t7582.flags
index 2cd4b38726..422d6be431 100644
--- a/test/files/run/t7582.flags
+++ b/test/files/run/t7582.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t7582b.flags b/test/files/run/t7582b.flags
index 2cd4b38726..422d6be431 100644
--- a/test/files/run/t7582b.flags
+++ b/test/files/run/t7582b.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
\ No newline at end of file
diff --git a/test/files/run/t7634.check b/test/files/run/t7634.check
index 879aea67a2..43128cad95 100644
--- a/test/files/run/t7634.check
+++ b/test/files/run/t7634.check
@@ -1,6 +1,6 @@
 
 
-scala> .lines
-res1: List[String] = List(shello, world.)
+scala> .lines.foreach(println)
+shello, world.
 
 scala> :quit
diff --git a/test/files/run/t7634.scala b/test/files/run/t7634.scala
index aeb6a5e671..9520931941 100644
--- a/test/files/run/t7634.scala
+++ b/test/files/run/t7634.scala
@@ -9,7 +9,7 @@ import scala.util.Properties.propOrElse
 object Test extends ReplTest {
   def java = propOrElse("javacmd", "java")
   def code = s""":sh $java -classpath $testOutput hello.Hello
-                |.lines""".stripMargin
+                |.lines.foreach(println)""".stripMargin
 }
 
 package hello {
diff --git a/test/files/run/t8601-closure-elim.flags b/test/files/run/t8601-closure-elim.flags
index 9158076b71..642187ff4c 100644
--- a/test/files/run/t8601-closure-elim.flags
+++ b/test/files/run/t8601-closure-elim.flags
@@ -1 +1 @@
--optimize -Ydelambdafy:inline -Ybackend:GenASM
+-Ydelambdafy:method -Yopt:l:classpath
diff --git a/test/files/run/t8601-closure-elim.scala b/test/files/run/t8601-closure-elim.scala
index ebeb16e0c7..40fbf1fe0e 100644
--- a/test/files/run/t8601-closure-elim.scala
+++ b/test/files/run/t8601-closure-elim.scala
@@ -1,4 +1,5 @@
 import scala.tools.partest.BytecodeTest
+import scala.tools.partest.ASMConverters.instructionsFromMethod
 import scala.tools.asm
 import scala.tools.asm.util._
 import scala.collection.JavaConverters._
@@ -10,8 +11,9 @@ object Test extends BytecodeTest {
     def test(methodName: String) {
       val classNode = loadClassNode("Foo")
       val methodNode = getMethod(classNode, "b")
+      val instrs = instructionsFromMethod(methodNode)
       val ops = methodNode.instructions.iterator.asScala.map(_.getOpcode).toList
-      assert(!ops.contains(asm.Opcodes.NEW), ops)// should be allocation free if the closure is eliminated
+      assert(!ops.contains(asm.Opcodes.NEW), instrs)// should be allocation free if the closure is eliminated
     }
     test("b")
   }
diff --git a/test/files/run/t8601.flags b/test/files/run/t8601.flags
index 2cd4b38726..65caa3736e 100644
--- a/test/files/run/t8601.flags
+++ b/test/files/run/t8601.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
diff --git a/test/files/run/t8601b.flags b/test/files/run/t8601b.flags
index 2cd4b38726..65caa3736e 100644
--- a/test/files/run/t8601b.flags
+++ b/test/files/run/t8601b.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
diff --git a/test/files/run/t8601c.flags b/test/files/run/t8601c.flags
index 2cd4b38726..65caa3736e 100644
--- a/test/files/run/t8601c.flags
+++ b/test/files/run/t8601c.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
diff --git a/test/files/run/t8601d.flags b/test/files/run/t8601d.flags
index 2cd4b38726..65caa3736e 100644
--- a/test/files/run/t8601d.flags
+++ b/test/files/run/t8601d.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
\ No newline at end of file
+-Yopt:l:classpath
diff --git a/test/files/run/t8601e.flags b/test/files/run/t8601e.flags
index b9bb09167e..65caa3736e 100644
--- a/test/files/run/t8601e.flags
+++ b/test/files/run/t8601e.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:classpath
diff --git a/test/files/run/t9003.flags b/test/files/run/t9003.flags
index b9bb09167e..65caa3736e 100644
--- a/test/files/run/t9003.flags
+++ b/test/files/run/t9003.flags
@@ -1 +1 @@
--optimize -Ybackend:GenASM
+-Yopt:l:classpath
diff --git a/test/files/run/t9110.scala b/test/files/run/t9110.scala
new file mode 100644
index 0000000000..660291a4d1
--- /dev/null
+++ b/test/files/run/t9110.scala
@@ -0,0 +1,27 @@
+trait Event
+
+trait Domain {
+  case class Created(name: String) extends Event
+}
+
+// declare three instances of Domain trait, one here and two
+// in an inner scope
+
+object DomainC extends Domain
+
+object Test {
+ def main(args: Array[String]) {
+   object DomainA extends Domain
+   object DomainB extends Domain
+
+   def lookingForAs(event: Event): Unit = {
+      event match {
+        case DomainB.Created(_) => throw null
+        case DomainC.Created(_) => throw null
+        case DomainA.Created(_) => // okay
+      }
+   }
+
+   lookingForAs(DomainA.Created("I am an A"))
+  }
+}
diff --git a/test/files/run/t9178a.flags b/test/files/run/t9178a.flags
new file mode 100644
index 0000000000..48fd867160
--- /dev/null
+++ b/test/files/run/t9178a.flags
@@ -0,0 +1 @@
+-Xexperimental
diff --git a/test/files/run/t9178a.scala b/test/files/run/t9178a.scala
new file mode 100644
index 0000000000..4788841f8d
--- /dev/null
+++ b/test/files/run/t9178a.scala
@@ -0,0 +1,15 @@
+trait Sam { def apply(): Unit }
+abstract class Test {
+  def foo(): Sam
+  // no parens, instantiateToMethodType would wrap in a `new Sam { def apply = foo }`
+  // rather than applying to an empty param list() */
+  val f: Sam = foo
+}
+
+object Test extends Test {
+  lazy val samIAm = new Sam { def apply() {} }
+  def foo() = samIAm
+  def main(args: Array[String]): Unit = {
+    assert(f eq samIAm, f)
+  }
+}
diff --git a/test/files/run/t9403.flags b/test/files/run/t9403.flags
index 307668060c..65caa3736e 100644
--- a/test/files/run/t9403.flags
+++ b/test/files/run/t9403.flags
@@ -1 +1 @@
--Ybackend:GenASM -optimize
+-Yopt:l:classpath
diff --git a/test/files/run/t9489.flags b/test/files/run/t9489.flags
new file mode 100644
index 0000000000..48fd867160
--- /dev/null
+++ b/test/files/run/t9489.flags
@@ -0,0 +1 @@
+-Xexperimental
diff --git a/test/files/run/t9489/A.java b/test/files/run/t9489/A.java
new file mode 100644
index 0000000000..c3536faa14
--- /dev/null
+++ b/test/files/run/t9489/A.java
@@ -0,0 +1,3 @@
+public class A {
+  public B b() { return null; }
+}
diff --git a/test/files/run/t9489/B.java b/test/files/run/t9489/B.java
new file mode 100644
index 0000000000..e5d1278cd7
--- /dev/null
+++ b/test/files/run/t9489/B.java
@@ -0,0 +1,3 @@
+public abstract class B {
+  public abstract int m();
+}
diff --git a/test/files/run/t9489/test.scala b/test/files/run/t9489/test.scala
new file mode 100644
index 0000000000..1b745af865
--- /dev/null
+++ b/test/files/run/t9489/test.scala
@@ -0,0 +1,10 @@
+class T {
+  def f(a: A) = g(a.b) // was: "found Int, required B"
+  def g(b: => B) = null
+}
+
+object Test extends T {
+  def main(args: Array[String]): Unit = {
+    f(new A)
+  }
+}
diff --git a/test/files/run/test-cpp.check b/test/files/run/test-cpp.check
deleted file mode 100644
index 40c10e3350..0000000000
--- a/test/files/run/test-cpp.check
+++ /dev/null
@@ -1,81 +0,0 @@
---- a
-+++ b
-@@ -54,3 +54,3 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, value x, value y
-+  locals: value args
-   startBlock: 1
-@@ -59,10 +59,6 @@
-   1: 
--    52	CONSTANT(2)
--    52	STORE_LOCAL(value x)
-     52	SCOPE_ENTER value x
--    53	LOAD_LOCAL(value x)
--    53	STORE_LOCAL(value y)
-     53	SCOPE_ENTER value y
-     54	LOAD_MODULE object Predef
--    54	LOAD_LOCAL(value y)
-+    54	CONSTANT(2)
-     54	BOX INT
-@@ -109,3 +105,3 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, value x, value y
-+  locals: value args, value x
-   startBlock: 1
-@@ -118,7 +114,5 @@
-     81	SCOPE_ENTER value x
--    82	LOAD_LOCAL(value x)
--    82	STORE_LOCAL(value y)
-     82	SCOPE_ENTER value y
-     83	LOAD_MODULE object Predef
--    83	LOAD_LOCAL(value y)
-+    83	LOAD_LOCAL(value x)
-     83	BOX INT
-@@ -152,3 +146,3 @@
-   def main(args: Array[String] (ARRAY[REF(class String)])): Unit {
--  locals: value args, value x, value y
-+  locals: value args
-   startBlock: 1
-@@ -157,10 +151,6 @@
-   1: 
--    66	THIS(TestAliasChainDerefThis)
--    66	STORE_LOCAL(value x)
-     66	SCOPE_ENTER value x
--    67	LOAD_LOCAL(value x)
--    67	STORE_LOCAL(value y)
-     67	SCOPE_ENTER value y
-     68	LOAD_MODULE object Predef
--    68	LOAD_LOCAL(value y)
-+    68	THIS(Object)
-     68	CALL_METHOD scala.Predef.println (dynamic)
-@@ -193,3 +183,3 @@
-   def test(x: Int (INT)): Unit {
--  locals: value x, value y
-+  locals: value x
-   startBlock: 1
-@@ -198,7 +188,5 @@
-   1: 
--    29	LOAD_LOCAL(value x)
--    29	STORE_LOCAL(value y)
-     29	SCOPE_ENTER value y
-     30	LOAD_MODULE object Predef
--    30	LOAD_LOCAL(value y)
-+    30	LOAD_LOCAL(value x)
-     30	BOX INT
-@@ -240,7 +228,5 @@
-     96	SCOPE_ENTER variable x
--    97	LOAD_LOCAL(variable x)
--    97	STORE_LOCAL(variable y)
-     97	SCOPE_ENTER variable y
-     98	LOAD_MODULE object Predef
--    98	LOAD_LOCAL(variable y)
-+    98	LOAD_LOCAL(variable x)
-     98	BOX INT
-@@ -250,6 +236,4 @@
-     100	STORE_LOCAL(variable y)
--    101	LOAD_LOCAL(variable y)
--    101	STORE_LOCAL(variable x)
-     102	LOAD_MODULE object Predef
--    102	LOAD_LOCAL(variable x)
-+    102	LOAD_LOCAL(variable y)
-     102	BOX INT
diff --git a/test/files/run/test-cpp.scala b/test/files/run/test-cpp.scala
deleted file mode 100644
index 80163deb66..0000000000
--- a/test/files/run/test-cpp.scala
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * The only change is in the decision to replace a LOAD_LOCAL(l)
- * in the copy-propagation performed before ClosureElimination.
- *
- * In the general case, the local variable 'l' is connected through
- * an alias chain with other local variables and at the end of the
- * alias chain there may be a Value, call it 'v'.
- *
- * If 'v' is cheaper to access (it is a Deref(This) or Const(_)), then
- * replace the instruction to load it from the cheaper place.
- * Otherwise, we use the local variable at the end of the alias chain
- * instead of 'l'.
- */
-
-import scala.tools.partest.IcodeComparison
-
-object Test extends IcodeComparison {
-  override def printIcodeAfterPhase = "dce"; override def extraSettings: String = super.extraSettings + " -Ybackend:GenASM" // same line to minimize check file changs
-}
-
-import scala.util.Random._
-
-/**
- * The example in the bug report (Issue-5321): an alias chain which store
- * an Unknown. Should remove local variable 'y'.
- */
-object TestBugReport {
-  def test(x: Int) = {
-    val y = x
-    println(y)
-  }
-}
-
-/**
- * The code taken from scala.tools.nsc.settings.Settings:
- * After inlining of the setter is performed, there is an opportunity for
- * copy-propagation to eliminate some local variables.
- */
-object TestSetterInline {
-  private var _postSetHook: this.type => Unit = (x: this.type) => ()
-  def withPostSetHook(f: this.type => Unit): this.type = { _postSetHook = f ; this }
-}
-
-
-/**
- * The access of the local variable 'y' should be replaced by the
- * constant.
- */
-object TestAliasChainConstant {
-
-  def main(args: Array[String]): Unit = {
-    val x = 2
-    val y = x
-    println(y)
-  }
-}
-
-/**
- * At the end of the alias chain we have a reference to 'this'.
- * The local variables should be all discarded and replace by a
- * direct reference to this
- */
-class TestAliasChainDerefThis {
-
-  def main(args: Array[String]): Unit = {
-    val x = this
-    val y = x
-    println(y)
-  }
-}
-
-/**
- * At the end of the alias chain, there is the value of a field.
- * The use of variable 'y' should be replaced by 'x', not by an access
- * to the field 'f' since it is more costly.
- */
-object TestAliasChainDerefField {
-  def f = nextInt
-
-  def main(args: Array[String]): Unit = {
-    val x = f
-    val y = x
-    println(y)
-  }
-}
-
-
-/**
- * The first time 'println' is called, 'x' is replaced by 'y'
- * and the second time, 'y' is replaced by 'x'. But none of them
- * can be removed.
- */
-object TestDifferentBindings {
-
-  def main(args: Array[String]): Unit = {
-    var x = nextInt
-    var y = x
-    println(y)
-
-    y = nextInt
-    x = y
-    println(x)
-  }
-}
diff --git a/test/files/run/trait-defaults-modules.scala b/test/files/run/trait-defaults-modules.scala
new file mode 100644
index 0000000000..93fc74baff
--- /dev/null
+++ b/test/files/run/trait-defaults-modules.scala
@@ -0,0 +1,20 @@
+trait T1 { def a: Any }
+
+trait T2 extends T1 { object a; object b; private object c; def usec: Any = c}
+trait T3 extends T2
+
+class C1 extends T1 { object a; object b }
+class C2 extends C1
+class C3 extends T2
+class C4 extends T3
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    val (c1, c2, c3, c4) = (new C1, new C2, new C3, new C4)
+    c1.a; c1.b; (c1: T1).a
+    c2.a; c2.b; (c2: T1).a
+    c3.a; c3.b; (c3: T1).a; c3.usec
+    c4.a; c4.b; (c4: T1).a; c4.usec
+  }
+
+}
diff --git a/test/files/run/trait-defaults-modules2/T_1.scala b/test/files/run/trait-defaults-modules2/T_1.scala
new file mode 100644
index 0000000000..962acdade1
--- /dev/null
+++ b/test/files/run/trait-defaults-modules2/T_1.scala
@@ -0,0 +1,4 @@
+trait T {
+  private object O
+  def useO: Any = O
+}
diff --git a/test/files/run/trait-defaults-modules2/Test_2.scala b/test/files/run/trait-defaults-modules2/Test_2.scala
new file mode 100644
index 0000000000..a1c49f5ddd
--- /dev/null
+++ b/test/files/run/trait-defaults-modules2/Test_2.scala
@@ -0,0 +1,5 @@
+object Test extends T {
+  def main(args: Array[String]): Unit = {
+    useO
+  }
+}
diff --git a/test/files/run/trait-defaults-modules3.scala b/test/files/run/trait-defaults-modules3.scala
new file mode 100644
index 0000000000..8790a95f4c
--- /dev/null
+++ b/test/files/run/trait-defaults-modules3.scala
@@ -0,0 +1,8 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    object O
+    val x = O
+    val y = O
+    assert(x eq y)
+  }
+}
diff --git a/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala b/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala
index f490d9490a..a80d1a27a1 100644
--- a/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala
+++ b/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala
@@ -27,7 +27,7 @@ class ParallelRangeCheck(val tasksupport: TaskSupport) extends ParallelSeqCheck[
 
   def isCheckingViews = false
 
-  def ofSize(vals: Seq[Gen[Int]], sz: Int) = unsupported
+  def ofSize(vals: Seq[Gen[Int]], sz: Int) = throw new UnsupportedOperationException
 
   override def instances(vals: Seq[Gen[Int]]): Gen[Seq[Int]] = sized { start =>
     sized { end =>