6 files changed, 80 insertions, 0 deletions
diff --git a/test/files/neg/t6260.check b/test/files/neg/t6260.check
new file mode 100644
index 0000000000..2b7f1a8bfb
--- /dev/null
+++ b/test/files/neg/t6260.check
@@ -0,0 +1,13 @@
+t6260.scala:3: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun
+which overrides method apply: (v1: T1)R in trait Function1
+clashes with definition of the member itself;
+both have erased type (v1: Object)Object
+    ((bx: Box[X]) => new Box(f(bx.x)))(this)
+                  ^
+t6260.scala:8: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun
+which overrides method apply: (v1: T1)R in trait Function1
+clashes with definition of the member itself;
+both have erased type (v1: Object)Object
+    ((bx: Box[X]) => new Box(f(bx.x)))(self)
+                  ^
+two errors found
diff --git a/test/files/neg/t6260.scala b/test/files/neg/t6260.scala
new file mode 100644
index 0000000000..93b5448227
--- /dev/null
+++ b/test/files/neg/t6260.scala
@@ -0,0 +1,17 @@
+class Box[X](val x: X) extends AnyVal {
+  def map[Y](f: X => Y): Box[Y] =
+    ((bx: Box[X]) => new Box(f(bx.x)))(this)
+}
+
+object Test {
+  def map2[X, Y](self: Box[X], f: X => Y): Box[Y] =
+    ((bx: Box[X]) => new Box(f(bx.x)))(self)
+
+  def main(args: Array[String]) {
+    val f = (x: Int) => x + 1
+    val g = (x: String) => x + x
+
+    map2(new Box(42), f)
+    new Box("abc") map g
+  }
+}
diff --git a/test/files/neg/t6385.check b/test/files/neg/t6385.check
new file mode 100644
index 0000000000..93e51e8927
--- /dev/null
+++ b/test/files/neg/t6385.check
@@ -0,0 +1,7 @@
+t6385.scala:12: error: bridge generated for member method x: ()C[T] in class C
+which overrides method x: ()C[T] in trait AA
+clashes with definition of the member itself;
+both have erased type ()Object
+   def x = this
+       ^
+one error found
diff --git a/test/files/neg/t6385.scala b/test/files/neg/t6385.scala
new file mode 100644
index 0000000000..cec58eec9e
--- /dev/null
+++ b/test/files/neg/t6385.scala
@@ -0,0 +1,13 @@
+object N {
+   def main(args: Array[String]) {
+      val y: AA[Int] = C(2)
+      val c: Int = y.x.y
+      println(c)
+   }
+}
+trait AA[T] extends Any {
+   def x: C[T]
+}
+case class C[T](val y: T) extends AnyVal with AA[T] {
+   def x = this
+}
diff --git a/test/files/neg/valueclasses-pavlov.check b/test/files/neg/valueclasses-pavlov.check
new file mode 100644
index 0000000000..031589edad
--- /dev/null
+++ b/test/files/neg/valueclasses-pavlov.check
@@ -0,0 +1,7 @@
+valueclasses-pavlov.scala:8: error: double definition:
+method foo:(x: Box2)String and
+method foo:(x: String)String at line 7
+have same type after erasure: (x: String)String
+  def foo(x: Box2) = "foo(Box2): ok"
+      ^
+one error found
diff --git a/test/files/neg/valueclasses-pavlov.scala b/test/files/neg/valueclasses-pavlov.scala
new file mode 100644
index 0000000000..a5858b2cf0
--- /dev/null
+++ b/test/files/neg/valueclasses-pavlov.scala
@@ -0,0 +1,23 @@
+trait Foo[T <: AnyVal] extends Any {
+  def foo(x: String): String
+  def foo(x: T): String
+}
+
+class Box1(val value: String) extends AnyVal with Foo[Box2] {
+  def foo(x: String) = "foo(String): ok"
+  def foo(x: Box2) = "foo(Box2): ok"
+}
+
+class Box2(val value: String) extends AnyVal
+
+
+object test2a {
+
+  def main(args: Array[String]) {
+    val b1 = new Box1(null)
+    val b2 = new Box2(null)
+    val f: Foo[Box2] = b1
+    println(f.foo(""))
+    println(f.foo(b2))
+  }
+}