Merge pull request scala#10840 from som-snytt/issue/10532

Regression test for bug 10532

Author: som-snytt

test/files/pos/t10532/C.java

@@ -0,0 +1,11 @@
+
+public class C {
+    public long f(long x, Long y) { return x + y; }
+    public long f(Long x, Long y) { return x + y; }
+
+    public long g(long x, String y) { return x + Long.parseLong(y); }
+    public long g(Long x, String y) { return x + Long.parseLong(y); }
+
+    public long h(long x) { return x + 1; }
+    public long h(Long x) { return x + 1; }
+}

test/files/pos/t10532/D.scala

@@ -0,0 +1,7 @@
+
+import java.lang.{Long => JLong}
+
+class D {
+  def f(x: Long, y: JLong): Long = x + y
+  def f(x: JLong, y: JLong): Long = x + y
+}

test/files/pos/t10532/test.scala

@@ -0,0 +1,17 @@
+
+object Test extends App {
+  val c = new C
+  val d = new D
+
+  println(c.f(42, 42))
+  println(c.f(42L, 42L))
+
+  println(c.g(42, "42"))
+  println(c.g(42L, "42"))
+
+  println(c.h(42))
+  println(c.h(42L))
+
+  println(d.f(42, 42))
+  println(d.f(42L, 42L))
+}