10 files changed, 181 insertions, 4 deletions
diff --git a/test/files/run/repl-inline.check b/test/files/run/repl-inline.check
new file mode 100644
index 0000000000..db729a67dd
--- /dev/null
+++ b/test/files/run/repl-inline.check
@@ -0,0 +1,11 @@
+warning: there was one deprecation warning (since 2.11.0); re-run with -deprecation for details
+callerOfCaller: String
+g: String
+h: String
+g: String
+h: String
+callerOfCaller: String
+g: String
+h: String
+g: String
+h: String
diff --git a/test/files/run/repl-inline.scala b/test/files/run/repl-inline.scala
new file mode 100644
index 0000000000..260ed28a4f
--- /dev/null
+++ b/test/files/run/repl-inline.scala
@@ -0,0 +1,27 @@
+import scala.tools.nsc._
+
+object Test {
+  val testCode =
+    """
+def callerOfCaller = Thread.currentThread.getStackTrace.drop(2).head.getMethodName
+def g = callerOfCaller
+def h = g
+assert(h == "g", h)
+@inline def g = callerOfCaller
+def h = g
+assert(h == "h", h)
+  """
+
+  def main(args: Array[String]) {
+    def test(f: Settings => Unit): Unit = {
+      val settings = new Settings()
+      settings.processArgumentString("-opt:l:classpath")
+      f(settings)
+      settings.usejavacp.value = true
+      val repl = new interpreter.IMain(settings)
+      testCode.linesIterator.foreach(repl.interpret(_))
+    }
+    test(_ => ())
+    test(_.Yreplclassbased.value = true)
+  }
+}
diff --git a/test/files/run/sd275-java/A.java b/test/files/run/sd275-java/A.java
new file mode 100644
index 0000000000..b293cf6dab
--- /dev/null
+++ b/test/files/run/sd275-java/A.java
@@ -0,0 +1,5 @@
+package sample;
+public class A {
+    public void irrelevant(p1.p2.p3.DeleteMe arg) {}
+    public static class A_Inner {}
+}
diff --git a/test/files/run/sd275-java/DeleteMe.java b/test/files/run/sd275-java/DeleteMe.java
new file mode 100644
index 0000000000..ccff2951d0
--- /dev/null
+++ b/test/files/run/sd275-java/DeleteMe.java
@@ -0,0 +1,4 @@
+package p1.p2.p3;
+
+public class DeleteMe {}
+
diff --git a/test/files/run/sd275-java/LeaveMe.java b/test/files/run/sd275-java/LeaveMe.java
new file mode 100644
index 0000000000..cb58f0080f
--- /dev/null
+++ b/test/files/run/sd275-java/LeaveMe.java
@@ -0,0 +1,3 @@
+package p1;
+
+public class LeaveMe {}
diff --git a/test/files/run/sd275-java/Test.scala b/test/files/run/sd275-java/Test.scala
new file mode 100644
index 0000000000..84187527d2
--- /dev/null
+++ b/test/files/run/sd275-java/Test.scala
@@ -0,0 +1,39 @@
+import scala.tools.partest._
+import java.io.File
+
+object Test extends StoreReporterDirectTest {
+  def code = ???
+
+  def compileCode(code: String) = {
+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(code)
+  }
+
+  def show(): Unit = {
+    deletePackage("p1/p2/p3")
+    deletePackage("p1/p2")
+
+    compileCode("""
+package sample
+
+class Test {
+  final class Inner extends A.A_Inner {
+    def foo = 42
+  }
+
+  def test = new Inner().foo
+}
+    """)
+    assert(storeReporter.infos.isEmpty, storeReporter.infos.mkString("\n"))
+  }
+
+  def deletePackage(name: String) {
+    val directory = new File(testOutput.path, name)
+    for (f <- directory.listFiles()) {
+      assert(f.getName.endsWith(".class"))
+      assert(f.delete())
+    }
+    assert(directory.listFiles().isEmpty)
+    assert(directory.delete())
+  }
+}
diff --git a/test/files/run/sd275.scala b/test/files/run/sd275.scala
new file mode 100644
index 0000000000..8cdee3ae15
--- /dev/null
+++ b/test/files/run/sd275.scala
@@ -0,0 +1,60 @@
+import scala.tools.partest._
+import java.io.File
+
+object Test extends StoreReporterDirectTest {
+  def code = ???
+
+  def compileCode(code: String) = {
+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
+    compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(code)
+  }
+
+  def show(): Unit = {
+    compileCode("""
+package sample {
+
+  class A1 {
+    def irrelevant: p1.p2.p3.DeleteMe = null
+  }
+  object A1 {
+    class A1_Inner
+  }
+}
+
+package p1 {
+  class LeaveMe
+  package p2 {
+    package p3 {
+      class DeleteMe
+    }
+  }
+}
+      """)
+    assert(filteredInfos.isEmpty, filteredInfos)
+    deletePackage("p1/p2/p3")
+    deletePackage("p1/p2")
+
+    compileCode("""
+package sample
+
+class Test {
+  final class Inner extends A1.A1_Inner {
+    def foo = 42
+  }
+
+  def test = new Inner().foo
+}
+    """)
+    assert(storeReporter.infos.isEmpty, storeReporter.infos.mkString("\n")) // Included a MissingRequirementError before.
+  }
+
+  def deletePackage(name: String) {
+    val directory = new File(testOutput.path, name)
+    for (f <- directory.listFiles()) {
+      assert(f.getName.endsWith(".class"))
+      assert(f.delete())
+    }
+    assert(directory.listFiles().isEmpty)
+    assert(directory.delete())
+  }
+}
diff --git a/test/files/run/t10009.scala b/test/files/run/t10009.scala
new file mode 100644
index 0000000000..2a318752f1
--- /dev/null
+++ b/test/files/run/t10009.scala
@@ -0,0 +1,28 @@
+import scala.reflect.runtime.currentMirror
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.ToolBox
+
+object Test {
+  def test(code: String, log: Boolean = false) {
+    val tb = currentMirror.mkToolBox()
+    val tree = tb.parse(code)
+    val typed = tb.typecheck(tree)
+    if (log) {
+      println("=" * 80)
+      println(typed)
+    }
+    val untyped = tb.untypecheck(typed)
+    if (log) println(untyped)
+    val retyped = tb.typecheck(untyped)
+    if (log) println(retyped)
+  }
+  def main(args: Array[String]): Unit = {
+    test("{ class a { val x = 42 }; new a }") // failed
+    test("{ trait a { val x = 42 }; new a {} }") // worked
+    test("{ abstract class a { val x: Int } }") // worked
+    test("{ abstract class a { val x: Int }; new a { val x = 42 } }") // failed
+    test("{ class a { private val x = 42 }; new a }") // failed
+    test("{ class a { protected val x = 42 }; new a { x } }") // failed
+    test("{ class a { protected[a] val x = 42 }; new a }") // failed
+  }
+}
+\ No newline at end of file
diff --git a/test/files/run/t7747-repl.check b/test/files/run/t7747-repl.check
index 621a70205e..ab37da5722 100644
--- a/test/files/run/t7747-repl.check
+++ b/test/files/run/t7747-repl.check
@@ -246,12 +246,12 @@ scala> case class Bingo()
 defined class Bingo
 
 scala> List(BippyBups(), PuppyPups(), Bingo()) // show
-class $read extends _root_.java.io.Serializable {
+sealed class $read extends _root_.java.io.Serializable {
   def <init>() = {
     super.<init>;
     ()
   };
-  class $iw extends _root_.java.io.Serializable {
+  sealed class $iw extends _root_.java.io.Serializable {
     def <init>() = {
       super.<init>;
       ()
@@ -262,7 +262,7 @@ class $read extends _root_.java.io.Serializable {
     import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
     import $line46.$read.INSTANCE.$iw.$iw.Bingo;
     import $line46.$read.INSTANCE.$iw.$iw.Bingo;
-    class $iw extends _root_.java.io.Serializable {
+    sealed class $iw extends _root_.java.io.Serializable {
       def <init>() = {
         super.<init>;
         ()
diff --git a/test/files/run/virtpatmat_staging.flags b/test/files/run/virtpatmat_staging.flags
index 0a22f7c729..bec3aa96e9 100644
--- a/test/files/run/virtpatmat_staging.flags
+++ b/test/files/run/virtpatmat_staging.flags
@@ -1,2 +1,2 @@
 -Yrangepos:false
--Xexperimental
+-Yvirtpatmat