8 files changed, 54 insertions, 21 deletions
diff --git a/test/files/pos/t1439.scala b/test/files/pos/t1439.scala
index 68a7332b2a..0efcc74b65 100644
--- a/test/files/pos/t1439.scala
+++ b/test/files/pos/t1439.scala
@@ -2,7 +2,7 @@
 class View[C[A]] { }
 
 object Test {
-  null match {
+  (null: Any) match {
     case v: View[_] =>
   }
 }
diff --git a/test/files/pos/t3234.flags b/test/files/pos/t3234.flags
deleted file mode 100644
index c9cefdc4b9..0000000000
--- a/test/files/pos/t3234.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Xfatal-warnings
-\ No newline at end of file
diff --git a/test/files/pos/t3234.scala b/test/files/pos/t3234.scala
deleted file mode 100644
index 443d0467f0..0000000000
--- a/test/files/pos/t3234.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-trait Trait1 {
-  // need more work before this one works
-  // @inline 
-  def foo2(n: Int) = n*n
-}
-
-trait Trait2 {
-  @inline def foo3(n: Int) = 1
-}
-
-class Base extends Trait1 {
-  @inline def foo(n: Int) = n
-}
-
-object Test extends Base with Trait2 {
-  def main(args: Array[String]) = {
-    println(foo(42) + foo2(11) + foo3(2))
-  }
-}
-\ No newline at end of file
diff --git a/test/files/pos/t5958.scala b/test/files/pos/t5958.scala
new file mode 100644
index 0000000000..3b910f3633
--- /dev/null
+++ b/test/files/pos/t5958.scala
@@ -0,0 +1,15 @@
+class Test {
+  def newComponent(u: Universe): u.Component = ???
+
+  class Universe { self =>
+    class Component
+
+    newComponent(this): this.Component // error, but should be fine since this is a stable reference
+    newComponent(self): self.Component // error, but should be fine since this is a stable reference
+    newComponent(self): this.Component // error, but should be fine since this is a stable reference
+    newComponent(this): self.Component // error, but should be fine since this is a stable reference
+
+    val u = this
+    newComponent(u): u.Component // ok
+  }
+}
+\ No newline at end of file
diff --git a/test/files/pos/t6029.scala b/test/files/pos/t6029.scala
new file mode 100644
index 0000000000..8f1bbb4ebf
--- /dev/null
+++ b/test/files/pos/t6029.scala
@@ -0,0 +1,3 @@
+final case class V[A](x: A) extends AnyVal {
+  def flatMap[B](f: A => V[B]) = if (true) this else f(x)
+}
diff --git a/test/files/pos/t6117.scala b/test/files/pos/t6117.scala
new file mode 100644
index 0000000000..6aca84f72c
--- /dev/null
+++ b/test/files/pos/t6117.scala
@@ -0,0 +1,19 @@
+package test
+
+trait ImportMe {
+  def foo(i: Int) = 1
+  def foo(s: String) = 2
+}
+
+class Test(val importMe: ImportMe) {
+  import importMe._
+  import importMe._
+
+  // A.scala:12: error: reference to foo is ambiguous;
+  // it is imported twice in the same scope by
+  // import importMe._
+  // and import importMe._
+  //   println(foo(1))
+  //           ^
+  println(foo(1))
+}
diff --git a/test/files/pos/unchecked-a.flags b/test/files/pos/unchecked-a.flags
new file mode 100644
index 0000000000..779916d58f
--- /dev/null
+++ b/test/files/pos/unchecked-a.flags
@@ -0,0 +1 @@
+-unchecked -Xfatal-warnings
+\ No newline at end of file
diff --git a/test/files/pos/unchecked-a.scala b/test/files/pos/unchecked-a.scala
new file mode 100644
index 0000000000..deceb91c36
--- /dev/null
+++ b/test/files/pos/unchecked-a.scala
@@ -0,0 +1,15 @@
+trait Y
+trait Z extends Y
+class X[+A <: Y]
+
+object Test {
+  def f1(x: X[_ <: Y]) = x match {
+    case _: X[Any] => // looks a little funny; `Any` is outside the bounds for `A`
+  }
+  def f2(x: X[_ <: Y]) = x match {
+    case _: X[Y]   => // looks better, let's allow this (too)
+  }
+
+  // NonLocalReturnControl[_] warnings
+  def foo: Int = List(0).foldLeft(0){case _ => return 0}
+}