Merge pull request #1956 from JamesIry/SI-7011_2.10.x

SI-7011 Fix finding constructor type in captured var definitions
scala · Jan 25, 2013 · 2fa859e · 2fa859e
2 parents 3753efc + d592216
commit 2fa859e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/compiler/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
@@ -443,10 +443,10 @@ abstract class LambdaLift extends InfoTransform {
             /* Creating a constructor argument if one isn't present. */
             val constructorArg = rhs match {
               case EmptyTree =>
-                sym.primaryConstructor.info.paramTypes match {
+                sym.tpe.typeSymbol.primaryConstructor.info.paramTypes match {
                   case List(tp) => gen.mkZero(tp)
                   case _        =>
-                    log("Couldn't determine how to properly construct " + sym)
+                    debugwarn("Couldn't determine how to properly construct " + sym)
                     rhs
                 }
               case arg => arg

diff --git a/test/files/pos/t7011.flags b/test/files/pos/t7011.flags
@@ -0,0 +1 @@
+-Ydebug -Xfatal-warnings
diff --git a/test/files/pos/t7011.scala b/test/files/pos/t7011.scala
@@ -0,0 +1,7 @@
+object bar {
+	def foo {
+    lazy val x = 42
+
+    {()=>x}
+  }
+}