LambdaLift: do not close over members that are static.

DarkDimius · DarkDimius · commit 3b0cb481e379 · 2016-05-27T14:14:33.000+02:00
diff --git a/src/dotty/tools/dotc/transform/LambdaLift.scala b/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -251,8 +251,8 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
             }
             def captureImplicitThis(x: Type): Unit = {
               x match {
-                case TermRef(x, _) => captureImplicitThis(x)
-                case x: ThisType => narrowTo(x.tref.typeSymbol.asClass)
+                case tr@TermRef(x, _) if (!tr.termSymbol.isStatic) => captureImplicitThis(x)
+                case x: ThisType if (!x.tref.typeSymbol.isStaticOwner) => narrowTo(x.tref.typeSymbol.asClass)
                 case _ =>
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,8 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform`
`251`	`251`	`}`
`252`	`252`	`def captureImplicitThis(x: Type): Unit = {`
`253`	`253`	`x match {`
`254`		`- case TermRef(x, _) => captureImplicitThis(x)`
`255`		`- case x: ThisType => narrowTo(x.tref.typeSymbol.asClass)`
	`254`	`+ case tr@TermRef(x, _) if (!tr.termSymbol.isStatic) => captureImplicitThis(x)`
	`255`	`+ case x: ThisType if (!x.tref.typeSymbol.isStaticOwner) => narrowTo(x.tref.typeSymbol.asClass)`
`256`	`256`	`case _ =>`
`257`	`257`	`}`
`258`	`258`	`}`