Merge pull request #3384 from adriaanm/merge-2.10.xv2.11.0-M8

Merge 2.10.x

2 files changed, 31 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index ef50ae276f..e193cf3de2 100644
--- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -685,11 +685,13 @@ abstract class UnCurry extends InfoTransform
           case Packed(param, tempVal) => (param, tempVal)
         }.unzip
 
-        val rhs1 = localTyper.typedPos(rhs.pos) {
-          // Patch the method body to refer to the temp vals
-          val rhsSubstituted = rhs.substituteSymbols(packedParams map (_.symbol), tempVals map (_.symbol))
-          // The new method body: { val p$1 = p.asInstanceOf[<dependent type>]; ...; <rhsSubstituted> }
-          Block(tempVals, rhsSubstituted)
+        val rhs1 = if (tempVals.isEmpty) rhs else {
+          localTyper.typedPos(rhs.pos) {
+            // Patch the method body to refer to the temp vals
+            val rhsSubstituted = rhs.substituteSymbols(packedParams map (_.symbol), tempVals map (_.symbol))
+            // The new method body: { val p$1 = p.asInstanceOf[<dependent type>]; ...; <rhsSubstituted> }
+            Block(tempVals, rhsSubstituted)
+          }
         }
 
         (allParams :: Nil, rhs1)
diff --git a/test/files/pos/t8138.scala b/test/files/pos/t8138.scala
new file mode 100644
index 0000000000..b980930955
--- /dev/null
+++ b/test/files/pos/t8138.scala
@@ -0,0 +1,24 @@
+
+class U {
+  trait Transformer {
+    def transform(a: Tree): Tree = ???
+  }
+  trait Tree
+}
+
+object Test {
+  def m(u: U) = {
+    class C extends u.Transformer {
+      override def transform(t: u.Tree): u.Tree = {
+        null match {
+          case _ =>
+            // crashes in GenICode:
+            // error: Unknown type: <notype>, <notype> [class scala.reflect.internal.Types$NoType$, class scala.reflect.internal.Types$NoType$] TypeRef? false
+            (y: Any) => super.transform(???)
+            null
+        }
+        ???
+      }
+    }
+  }
+}