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

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

2 files changed, 32 insertions, 0 deletions

diff --git a/test/pending/pos/t1336.scala b/test/pending/pos/t1336.scala
new file mode 100644
index 0000000000..63967985c7
--- /dev/null
+++ b/test/pending/pos/t1336.scala
@@ -0,0 +1,10 @@
+object Foo {
+  def foreach( f : ((Int,Int)) => Unit ) {
+    println("foreach")
+    f(1,2)
+  }
+
+  for( (a,b) <- this ) {
+    println((a,b))
+  }
+}
diff --git a/test/pending/pos/t5589.scala b/test/pending/pos/t5589.scala
new file mode 100644
index 0000000000..69cbb20391
--- /dev/null
+++ b/test/pending/pos/t5589.scala
@@ -0,0 +1,22 @@
+class A {
+  // First three compile.
+  def f1(x: Either[Int, String])        = x.right map (y => y)
+  def f2(x: Either[Int, String])        = for (y <- x.right) yield y
+  def f3(x: Either[Int, (String, Int)]) = x.right map { case (y1, y2) => (y1, y2) }
+  // Last one fails.
+  def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2))
+/**
+./a.scala:5: error: constructor cannot be instantiated to expected type;
+ found   : (T1, T2)
+ required: Either[Nothing,(String, Int)]
+  def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2))
+                                               ^
+./a.scala:5: error: not found: value y1
+  def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2))
+                                                                            ^
+./a.scala:5: error: not found: value y2
+  def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2))
+                                                                                ^
+three errors found
+**/
+}