Merge pull request #4784 from lrytz/merge-2.11-to-2.12-oct-5v2.12.0-M3

Merge 2.11 to 2.12 oct 5

1 files changed, 17 insertions, 0 deletions

diff --git a/test/files/run/t7850d.scala b/test/files/run/t7850d.scala
new file mode 100644
index 0000000000..ccc98f1bcc
--- /dev/null
+++ b/test/files/run/t7850d.scala
@@ -0,0 +1,17 @@
+// Testing that the ad-hoc overload resolution of isEmpty/get discards
+// parameter-accepting variants
+trait T[A, B >: Null] { def isEmpty: A = false.asInstanceOf[A]; def get: B = null}
+class Casey1(val a: Int) {
+  def isEmpty: Boolean = false
+  def isEmpty(x: Int): Boolean = ???
+  def get: Int = a
+  def get(x: Int): String = ???
+}
+object Casey1 { def unapply(a: Casey1) = a }
+
+object Test {
+  def main(args: Array[String]) {
+    val c @ Casey1(x) = new Casey1(0)
+    assert(x == c.get)
+  }
+}