10 files changed, 249 insertions, 1 deletions
diff --git a/test/files/neg/t6040.check b/test/files/neg/t6040.check
index f6757f97e3..f91df0c46d 100644
--- a/test/files/neg/t6040.check
+++ b/test/files/neg/t6040.check
@@ -1,7 +1,9 @@
-error: extension of type scala.Dynamic needs to be enabled
+t6040.scala:1: error: extension of type scala.Dynamic needs to be enabled
 by making the implicit value 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
 why the feature needs to be explicitly enabled.
+class X extends Dynamic
+                ^
 one error found
diff --git a/test/files/neg/t6231.check b/test/files/neg/t6231.check
new file mode 100644
index 0000000000..b27961d393
--- /dev/null
+++ b/test/files/neg/t6231.check
@@ -0,0 +1,6 @@
+t6231.scala:4: error: Implementation restriction: local trait Bug$X$1 is unable to automatically capture the
+free variable value ev$1 on behalf of anonymous class anonfun$qux$1. You can manually assign it to a val inside the trait,
+and refer that that val in anonymous class anonfun$qux$1. For more details, see SI-6231.
+      def qux = { () => ev }
+                        ^
+one error found
diff --git a/test/files/neg/t6231.scala b/test/files/neg/t6231.scala
new file mode 100644
index 0000000000..1e5b4e0e1a
--- /dev/null
+++ b/test/files/neg/t6231.scala
@@ -0,0 +1,15 @@
+object Bug {
+  def bar(ev: Any) = {
+    trait X {
+      def qux = { () => ev }
+    }
+    new X {}.qux()
+
+    // workaround
+    trait Y {
+      val ev2 = ev // manually capture `ev` so that `ev2` is added to the trait interface.
+      def qux = { () => ev2 }
+    }
+  }
+}
+
diff --git a/test/files/neg/t6666.check b/test/files/neg/t6666.check
new file mode 100644
index 0000000000..d0378173ea
--- /dev/null
+++ b/test/files/neg/t6666.check
@@ -0,0 +1,40 @@
+t6666.scala:23: error: Implementation restriction: access of method x$2 in object O1 from anonymous class 2, would require illegal premature access to object O1
+  F.byname(x)
+           ^
+t6666.scala:30: error: Implementation restriction: access of value x$3 in object O2 from anonymous class 3, would require illegal premature access to object O2
+  F.byname(x)
+           ^
+t6666.scala:37: error: Implementation restriction: access of method x$4 in object O3 from anonymous class 4, would require illegal premature access to object O3
+  F.hof(() => x)
+              ^
+t6666.scala:50: error: Implementation restriction: access of method x$6 in class C1 from anonymous class 7, would require illegal premature access to the unconstructed `this` of class C1
+  F.byname(x)
+           ^
+t6666.scala:54: error: Implementation restriction: access of value x$7 in class C2 from anonymous class 8, would require illegal premature access to the unconstructed `this` of class C2
+  F.byname(x)
+           ^
+t6666.scala:58: error: Implementation restriction: access of method x$8 in class C3 from anonymous class 9, would require illegal premature access to the unconstructed `this` of class C3
+  F.hof(() => x)
+              ^
+t6666.scala:62: error: Implementation restriction: access of method x$9 in class C4 from object Nested$5, would require illegal premature access to the unconstructed `this` of class C4
+  object Nested { def xx = x}
+                           ^
+t6666.scala:68: error: Implementation restriction: access of method x$10 in class C5 from object Nested$6, would require illegal premature access to the unconstructed `this` of class C5
+    object Nested { def xx = x}
+                             ^
+t6666.scala:83: error: Implementation restriction: access of method x$12 in class C11 from anonymous class 12, would require illegal premature access to the unconstructed `this` of class C11
+      F.byname(x)
+               ^
+t6666.scala:102: error: Implementation restriction: access of method x$13 in class C13 from anonymous class 13, would require illegal premature access to the unconstructed `this` of class C13
+      F.hof(() => x)
+                  ^
+t6666.scala:111: error: Implementation restriction: access of method x$14 in class C14 from object Nested$7, would require illegal premature access to the unconstructed `this` of class C14
+      object Nested { def xx = x}
+                               ^
+t6666.scala:122: error: Implementation restriction: access of method x$15 in class C15 from object Nested$8, would require illegal premature access to the unconstructed `this` of class C15
+        object Nested { def xx = x}
+                                 ^
+t6666.scala:131: error: Implementation restriction: access of method foo$1 in class COuter from class CInner$1, would require illegal premature access to the unconstructed `this` of class COuter
+  class CInner extends C({foo})
+                          ^
+13 errors found
diff --git a/test/files/neg/t6666.scala b/test/files/neg/t6666.scala
new file mode 100644
index 0000000000..d37ffaf141
--- /dev/null
+++ b/test/files/neg/t6666.scala
@@ -0,0 +1,132 @@
+class C(a: Any)
+object F {
+  def byname(a: => Any) = println(a)
+  def hof(a: () => Any) = println(a())
+}
+
+class COkay extends C(0) {
+  def this(a: Any) {
+    this()
+    def x = "".toString
+    F.byname(x)
+  }
+}
+
+//
+// The thunk's apply method accesses the MODULE$
+// field before it is set.
+//
+//   0: getstatic #23; //Field O1$.MODULE$:LO1$;
+//   3: invokevirtual #26; //Method O1$.O1$$x$1:()Ljava/lang/String;
+object O1 extends C({
+  def x = "".toString
+  F.byname(x)
+})
+
+// java.lang.NullPointerException
+//   at O2$$anonfun$$init$$1.apply(<console>:11)
+object O2 extends C({
+  lazy val x = "".toString
+  F.byname(x)
+})
+
+// java.lang.NullPointerException
+//   at O3$$anonfun$$init$$1.apply(<console>:11)
+object O3 extends C({
+  def x = "".toString
+  F.hof(() => x)
+})
+
+// Okay, the nested classes don't get an outer pointer passed,
+// just an extra param for `x: String`.
+object O6 extends C({
+  val x = "".toString
+  F.byname(x); F.hof(() => x); (new { val xx = x }.xx)
+})
+
+
+class C1 extends C({
+  def x = "".toString
+  F.byname(x)
+})
+class C2 extends C({
+  lazy val x = "".toString
+  F.byname(x)
+})
+class C3 extends C({
+  def x = "".toString
+  F.hof(() => x)
+})
+class C4 extends C({
+  def x = "".toString
+  object Nested { def xx = x}
+  Nested.xx
+})
+class C5 extends C({
+  def x = "".toString
+  val y = {
+    object Nested { def xx = x}
+    Nested.xx
+  }
+})
+
+// okay, for same reason as O6
+class C6 extends C({
+  val x = "".toString
+  F.byname(x); F.hof(() => x); (new { val xx = x }.xx)
+})
+
+class C11(a: Any) {
+  def this() = {
+    this({
+     def x = "".toString
+      F.byname(x)
+    })
+  }
+}
+
+// Crashes earlier in lazyVals.
+// class C12(a: Any) {
+//   def this() = {
+//     this({
+//       lazy val x = "".toString
+//       F.byname(x)
+//     })
+//   }
+// }
+
+class C13(a: Any) {
+  def this() = {
+    this({
+      def x = "".toString
+      F.hof(() => x)
+    })
+  }
+}
+
+class C14(a: Any) {
+  def this() = {
+    this({
+      def x = "".toString
+      object Nested { def xx = x}
+      Nested.xx
+    })
+  }
+}
+
+class C15(a: Any) {
+  def this() = {
+    this({
+      def x = "".toString
+      val y = {
+        object Nested { def xx = x}
+        Nested.xx
+      }
+    })
+  }
+}
+
+class COuter extends C({
+  def foo = 0
+  class CInner extends C({foo})
+})
+\ No newline at end of file
diff --git a/test/files/neg/t6902.check b/test/files/neg/t6902.check
new file mode 100644
index 0000000000..ed0ed75303
--- /dev/null
+++ b/test/files/neg/t6902.check
@@ -0,0 +1,12 @@
+t6902.scala:4: warning: unreachable code
+    case Some(b) => 3 // no warning was emitted
+                    ^
+t6902.scala:9: warning: unreachable code
+    case Some(b) => 3 // no warning was emitted
+                    ^
+t6902.scala:21: warning: unreachable code
+    case 1 => 3 // crash
+              ^
+error: No warnings can be incurred under -Xfatal-warnings.
+three warnings found
+one error found
diff --git a/test/files/neg/t6902.flags b/test/files/neg/t6902.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/files/neg/t6902.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
+\ No newline at end of file
diff --git a/test/files/neg/t6902.scala b/test/files/neg/t6902.scala
new file mode 100644
index 0000000000..ce5ff8b6fb
--- /dev/null
+++ b/test/files/neg/t6902.scala
@@ -0,0 +1,23 @@
+object Test {
+  Some(Some(1)) collect {
+    case Some(a) => 2
+    case Some(b) => 3 // no warning was emitted
+  }
+
+  (Some(1): @ unchecked) match {
+    case Some(a) => 2
+    case Some(b) => 3 // no warning was emitted
+  }
+
+  // A variation of SI-6011, which eluded the fix
+  // in 2.10.0.
+  //
+  // duplicate keys in SWITCH, can't pick arbitrarily one of them to evict, see SI-6011.
+  // at scala.reflect.internal.SymbolTable.abort(SymbolTable.scala:50)
+  // at scala.tools.nsc.Global.abort(Global.scala:249)
+  // at scala.tools.nsc.backend.jvm.GenASM$JPlainBuilder$jcode$.emitSWITCH(GenASM.scala:1850)
+  ((1: Byte): @unchecked @annotation.switch) match {
+    case 1 => 2
+    case 1 => 3 // crash
+  }
+}
diff --git a/test/files/neg/t6952.check b/test/files/neg/t6952.check
new file mode 100644
index 0000000000..f1e1881404
--- /dev/null
+++ b/test/files/neg/t6952.check
@@ -0,0 +1,13 @@
+t6952.scala:2: error: extension of type scala.Dynamic needs to be enabled
+by making the implicit value 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
+why the feature needs to be explicitly enabled.
+trait B extends Dynamic
+                ^
+t6952.scala:3: error: extension of type scala.Dynamic needs to be enabled
+by making the implicit value language.dynamics visible.
+trait C extends A with Dynamic
+                       ^
+two errors found
diff --git a/test/files/neg/t6952.scala b/test/files/neg/t6952.scala
new file mode 100644
index 0000000000..257ea3be68
--- /dev/null
+++ b/test/files/neg/t6952.scala
@@ -0,0 +1,4 @@
+trait A
+trait B extends Dynamic
+trait C extends A with Dynamic
+trait D extends B