Merge pull request #1857 from retronym/ticket/6443-2.10.x

SI-6443 Widen dependent param types in uncurry

9 files changed, 110 insertions, 0 deletions

diff --git a/test/files/neg/t6443c.check b/test/files/neg/t6443c.check
new file mode 100644
index 0000000000..7cf8d23f4b
--- /dev/null
+++ b/test/files/neg/t6443c.check
@@ -0,0 +1,7 @@
+t6443c.scala:16: error: double definition:
+method foo:(d: B.D)(a: Any)(d2: d.type)Unit and
+method foo:(d: B.D)(a: Any, d2: d.type)Unit at line 11
+have same type after erasure: (d: B.D, a: Object, d2: B.D)Unit
+  def foo(d: D)(a: Any)(d2: d.type): Unit = ()
+      ^
+one error found
diff --git a/test/files/neg/t6443c.scala b/test/files/neg/t6443c.scala
new file mode 100644
index 0000000000..817224e043
--- /dev/null
+++ b/test/files/neg/t6443c.scala
@@ -0,0 +1,21 @@
+trait A {
+  type D >: Null <: C
+  def foo(d: D)(a: Any, d2: d.type): Unit
+  trait C {
+    def bar: Unit = foo(null)(null, null)
+  }
+}
+object B extends A {
+  class D extends C
+
+  def foo(d: D)(a: Any, d2: d.type): Unit = () // Bridge method required here!
+
+  // No bridge method should be added, but we'll be happy enough if
+  // the "same type after erasure" error kicks in before the duplicated
+  // bridge causes a problem.
+  def foo(d: D)(a: Any)(d2: d.type): Unit = ()
+}
+
+object Test extends App {
+  new B.D().bar
+}
diff --git a/test/files/run/t6135.scala b/test/files/run/t6135.scala
new file mode 100644
index 0000000000..c0f8f3fd1d
--- /dev/null
+++ b/test/files/run/t6135.scala
@@ -0,0 +1,13 @@
+object Test extends App {
+  class A { class V }
+
+  abstract class B[S] {
+    def foo(t: S, a: A)(v: a.V)
+  }
+
+  val b1 = new B[String] {
+    def foo(t: String, a: A)(v: a.V) = () // Bridge method required here!
+  }
+
+  b1.foo("", null)(null)
+}
diff --git a/test/files/run/t6443-by-name.check b/test/files/run/t6443-by-name.check
new file mode 100644
index 0000000000..6f98fa4a28
--- /dev/null
+++ b/test/files/run/t6443-by-name.check
@@ -0,0 +1,3 @@
+1
+foo
+foo
diff --git a/test/files/run/t6443-by-name.scala b/test/files/run/t6443-by-name.scala
new file mode 100644
index 0000000000..bfd9bf9791
--- /dev/null
+++ b/test/files/run/t6443-by-name.scala
@@ -0,0 +1,18 @@
+object Test {
+
+	def main(args: Array[String]) {
+		def foo = {println("foo"); 0}
+		lazyDep(X)(foo)
+	}
+
+  trait T {
+  	type U
+  }
+  object X extends T { type U = Int }
+
+	def lazyDep(t: T)(u: => t.U) {
+		println("1")
+		u
+		u
+	}
+}
diff --git a/test/files/run/t6443-varargs.check b/test/files/run/t6443-varargs.check
new file mode 100644
index 0000000000..257cc5642c
--- /dev/null
+++ b/test/files/run/t6443-varargs.check
@@ -0,0 +1 @@
+foo
diff --git a/test/files/run/t6443-varargs.scala b/test/files/run/t6443-varargs.scala
new file mode 100644
index 0000000000..9cbae3e99c
--- /dev/null
+++ b/test/files/run/t6443-varargs.scala
@@ -0,0 +1,16 @@
+object Test {
+
+	def main(args: Array[String]) {
+		def foo = {println("foo"); 0}
+		lazyDep(X)(foo)
+	}
+
+  trait T {
+  	type U
+  }
+  object X extends T { type U = Int }
+
+	def lazyDep(t: T)(us: t.U*) {
+		List(us: _*)
+	}
+}
diff --git a/test/files/run/t6443.scala b/test/files/run/t6443.scala
new file mode 100644
index 0000000000..67fe2cab22
--- /dev/null
+++ b/test/files/run/t6443.scala
@@ -0,0 +1,15 @@
+class Base
+class Derived extends Base
+
+trait A {
+  def foo(d: String)(d2: d.type): Base
+  val s = ""
+  def bar: Unit = foo(s)(s)
+}
+object B extends A {
+  def foo(d: String)(d2: d.type): D forSome { type D <: S; type S <: Derived } = {d2.isEmpty; null} // Bridge method required here!
+}
+
+object Test extends App {
+  B.bar
+}
diff --git a/test/files/run/t6443b.scala b/test/files/run/t6443b.scala
new file mode 100644
index 0000000000..9320b1dcfe
--- /dev/null
+++ b/test/files/run/t6443b.scala
@@ -0,0 +1,16 @@
+trait A {
+  type D >: Null <: C
+  def foo(d: D)(d2: d.type): Unit
+  trait C {
+    def bar: Unit = foo(null)(null)
+  }
+}
+object B extends A {
+  class D extends C
+
+  def foo(d: D)(d2: d.type): Unit = () // Bridge method required here!
+}
+
+object Test extends App {
+  new B.D().bar
+}