11 files changed, 210 insertions, 0 deletions
diff --git a/test/files/run/macro-subpatterns.check b/test/files/run/macro-subpatterns.check
new file mode 100644
index 0000000000..b34d4bf4a1
--- /dev/null
+++ b/test/files/run/macro-subpatterns.check
@@ -0,0 +1,3 @@
+List((a @ Extractor((b @ Extractor((c @ _))))))
+List((b @ Extractor((c @ _))))
+List((c @ _))
diff --git a/test/files/run/macro-subpatterns/Macro_1.scala b/test/files/run/macro-subpatterns/Macro_1.scala
new file mode 100644
index 0000000000..d8e86e27c6
--- /dev/null
+++ b/test/files/run/macro-subpatterns/Macro_1.scala
@@ -0,0 +1,18 @@
+import scala.reflect.macros.WhiteboxContext
+import language.experimental.macros
+
+object Extractor {
+  def unapply(x: Any): Any = macro unapplyImpl
+  def unapplyImpl(c: WhiteboxContext)(x: c.Tree) = {
+    val st = c.universe.asInstanceOf[reflect.internal.SymbolTable]
+    import st._
+    val subpatterns = x.attachments.get[SubpatternsAttachment].get.patterns
+    q"""
+      new {
+        def isEmpty = false
+        def get = ${subpatterns.toString}
+        def unapply(x: Any) = this
+      }.unapply(${x.asInstanceOf[st.Tree]})
+    """.asInstanceOf[c.Tree]
+  }
+}
diff --git a/test/files/run/macro-subpatterns/Test_2.scala b/test/files/run/macro-subpatterns/Test_2.scala
new file mode 100644
index 0000000000..dc6e668877
--- /dev/null
+++ b/test/files/run/macro-subpatterns/Test_2.scala
@@ -0,0 +1,5 @@
+object Test extends App {
+  42 match {
+    case Extractor(a @ Extractor(b @ Extractor(c))) => println(a); println(b); println(c)
+  }
+}
diff --git a/test/files/run/t4841-isolate-plugins.check b/test/files/run/t4841-isolate-plugins.check
new file mode 100644
index 0000000000..a6462b424b
--- /dev/null
+++ b/test/files/run/t4841-isolate-plugins.check
@@ -0,0 +1,2 @@
+My phase name is ploogin1_1
+My phase name is ploogin1_2
diff --git a/test/files/run/t4841-isolate-plugins/ploogin.scala b/test/files/run/t4841-isolate-plugins/ploogin.scala
new file mode 100644
index 0000000000..bd8c7275ec
--- /dev/null
+++ b/test/files/run/t4841-isolate-plugins/ploogin.scala
@@ -0,0 +1,30 @@
+
+package t4841
+
+import scala.tools.nsc.{ Global, Phase }
+import scala.tools.nsc.plugins.{ Plugin, PluginComponent }
+import scala.reflect.io.Path
+import scala.reflect.io.File
+
+/** A test plugin.  */
+class Ploogin(val global: Global, val name: String = "ploogin") extends Plugin {
+  import global._
+
+  val description = "A sample plugin for testing."
+  val components = List[PluginComponent](TestComponent)
+
+  private object TestComponent extends PluginComponent {
+    val global: Ploogin.this.global.type = Ploogin.this.global
+    //override val runsBefore = List("refchecks")
+    val runsAfter = List("jvm")
+    val phaseName = Ploogin.this.name
+    override def description = "A sample phase that does so many things it's kind of hard to describe briefly."
+    def newPhase(prev: Phase) = new TestPhase(prev)
+    class TestPhase(prev: Phase) extends StdPhase(prev) {
+      override def description = TestComponent.this.description
+      def apply(unit: CompilationUnit) {
+        if (settings.developer) inform(s"My phase name is $phaseName")
+      }
+    }
+  }
+}
diff --git a/test/files/run/t4841-isolate-plugins/t4841-isolate-plugin.scala b/test/files/run/t4841-isolate-plugins/t4841-isolate-plugin.scala
new file mode 100644
index 0000000000..5421922c9c
--- /dev/null
+++ b/test/files/run/t4841-isolate-plugins/t4841-isolate-plugin.scala
@@ -0,0 +1,39 @@
+
+import tools.nsc.plugins.PluginDescription
+import tools.partest.DirectTest
+
+import java.io.File
+
+// show that plugins are on isolated class loaders
+object Test extends DirectTest {
+  override def code = "class Code"
+
+  override def extraSettings = s"-usejavacp"
+
+  // plugin named ploogin1_1 or ploogin1_2, but not ploogin2_x
+  // Although the samples are in different classloaders, the plugin
+  // loader checks for distinctness by class name, so the names must differ.
+  def pluginCode(index: Int) = s"""
+    |package t4841 {
+    |  class SamplePloogin$index(global: scala.tools.nsc.Global) extends Ploogin(global, s"$${PlooginCounter.named}_$index")
+    |  object PlooginCounter {
+    |    val count = new java.util.concurrent.atomic.AtomicInteger
+    |    def named = s"ploogin$${count.incrementAndGet}"
+    |  }
+    |}""".stripMargin.trim
+
+  def compilePlugin(i: Int) = {
+    val out  = (testOutput / s"p$i").createDirectory()
+    val args = Seq("-usejavacp", "-d", out.path)
+    compileString(newCompiler(args: _*))(pluginCode(i))
+    val xml  = PluginDescription(s"p$i", s"t4841.SamplePloogin$i").toXML
+    (out / "scalac-plugin.xml").toFile writeAll xml
+    out
+  }
+
+  override def show() = {
+    val dirs = 1 to 2 map (compilePlugin(_))
+    compile("-Xdev", s"-Xplugin:${dirs mkString ","}", "-usejavacp", "-d", testOutput.path)
+  }
+}
+
diff --git a/test/files/run/t4841-no-plugin.check b/test/files/run/t4841-no-plugin.check
new file mode 100644
index 0000000000..4338f0ce23
--- /dev/null
+++ b/test/files/run/t4841-no-plugin.check
@@ -0,0 +1 @@
+warning: No plugin in path t4841-no-plugin-run.obj/plugins.partest
diff --git a/test/files/run/t4841-no-plugin.scala b/test/files/run/t4841-no-plugin.scala
new file mode 100644
index 0000000000..d91bf7ee21
--- /dev/null
+++ b/test/files/run/t4841-no-plugin.scala
@@ -0,0 +1,17 @@
+
+import tools.partest.DirectTest
+
+import java.io.File
+
+// warn only if no plugin on Xplugin path
+object Test extends DirectTest {
+  override def code = "class Code"
+
+  override def extraSettings = s"-usejavacp -d ${testOutput.path}"
+
+  override def show() = {
+    val tmp = new File(testOutput.jfile, "plugins.partest").getAbsolutePath
+    compile("-Xdev", s"-Xplugin:$tmp", "-Xpluginsdir", tmp)
+  }
+}
+
diff --git a/test/files/run/t7912.scala b/test/files/run/t7912.scala
new file mode 100644
index 0000000000..3d603e0e97
--- /dev/null
+++ b/test/files/run/t7912.scala
@@ -0,0 +1,16 @@
+case object A { override def toString = ??? }
+
+object Test {
+  def foo: Int = (A: Any) match {
+    case 0 => 0
+  }
+  def main(args: Array[String]): Unit = {
+    try {
+      foo
+      sys.error("no exception")
+    } catch {
+      case me: MatchError => assert(me.getMessage == "an instance of class A$", me.getMessage)
+      case ex: Throwable => sys.error("not a match error: " + ex.getClass)
+    }
+  }
+}
diff --git a/test/files/run/t8010.scala b/test/files/run/t8010.scala
new file mode 100644
index 0000000000..8636bbd12e
--- /dev/null
+++ b/test/files/run/t8010.scala
@@ -0,0 +1,22 @@
+trait Base {
+  def t          = 1
+  def t(n: Int)  = n
+  def bt         = 2
+  def bt(n: Int) = n
+}
+trait Derived extends Base {
+  // was: double defintion error
+  override def t          = 1 + super.t
+  override def t(n: Int)  = 1 + super.t(n)
+  override def bt         = 1 + super.bt
+  override def bt(n: Int) = 1 + super.bt(n)
+}
+
+object Test extends App {
+  val d = new Derived {}
+  // not the focus of thie bug, but let's just check the runtime behaviour while we're here.
+  assert(d.t == 2)
+  assert(d.t(1) == 2)
+  assert(d.bt == 3)
+  assert(d.bt(1) == 2)
+}
diff --git a/test/files/run/t8029.scala b/test/files/run/t8029.scala
new file mode 100644
index 0000000000..dbd5c41387
--- /dev/null
+++ b/test/files/run/t8029.scala
@@ -0,0 +1,57 @@
+import scala.tools.partest._
+import scala.tools.nsc._
+
+object Test extends DirectTest {
+
+  override def extraSettings: String = "-usejavacp -nowarn -Ystop-after:typer"
+
+  override def code = "" // not used
+
+  def code1 = """
+package object p1 {
+  trait A
+  object A
+}
+  """
+
+  def code2 = """
+package object p2 {
+  class A
+  object A
+}
+  """
+
+  def code3 = """
+package object p3 {
+  object A
+  trait A
+}
+  """
+
+  def code4 = """
+package object p4 {
+  object A
+  trait A
+}
+  """
+
+  def show() {
+    val global = newCompiler()
+    import global._
+    def typecheck(code: String): Unit = {
+      val r = new Run
+      val sourceFile = newSources(code).head
+      global.reporter.reset()
+      r.compileSources(sourceFile :: Nil)
+      assert(!global.reporter.hasErrors)
+    }
+
+    def typecheckTwice(code: String): Unit = {
+      typecheck(code)
+      typecheck(code)
+    }
+
+    // was: illegal cyclic reference involving package ...
+    Seq(code1, code2, code3, code4) foreach typecheckTwice
+  }
+}