Merge commit '644eb7078a' into wip/fresh-merge2

Conflicts:
	build.xml
	src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala

1 files changed, 13 insertions, 0 deletions

diff --git a/test/pending/run/t4574.scala b/test/pending/run/t4574.scala
new file mode 100644
index 0000000000..1dde496aca
--- /dev/null
+++ b/test/pending/run/t4574.scala
@@ -0,0 +1,13 @@
+object Test {
+  val xs: List[(Int, Int)] = List((2, 2), null)
+  
+  def expectMatchError[T](msg: String)(body: => T) {
+    try { body ; assert(false, "Should not succeed.") }
+    catch { case _: MatchError => println(msg) }
+  }
+
+  def main(args: Array[String]): Unit = {
+    expectMatchError("I hereby refute null!")( for ((x, y) <- xs) yield x )
+    expectMatchError("I denounce null as unListLike!")( (null: Any) match { case List(_*) => true } )
+  }
+}