Merge pull request scala#4508 from retronym/topic/uncurry-specialized

lrytz · lrytz · commit 0c360f6d285f · 2015-05-20T11:57:23.000+02:00
Avoid inefficient specialied lambdas w. delambdafy jvm-1.8, GenASM
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -237,7 +237,7 @@ abstract class UnCurry extends InfoTransform
 
           def canUseDelamdafyMethod = (
                (inConstructorFlag == 0) // Avoiding synthesizing code prone to SI-6666, SI-8363 by using old-style lambda translation
-            && (!isSpecialized || (settings.target.value == "jvm-1.8")) // DelambdafyTransformer currently only emits generic FunctionN-s, use the old style in the meantime
+            && (!isSpecialized || (settings.isBCodeActive && settings.target.value == "jvm-1.8")) // DelambdafyTransformer currently only emits generic FunctionN-s, use the old style in the meantime
           )
           if (inlineFunctionExpansion || !canUseDelamdafyMethod) {
             val parents = addSerializable(abstractFunctionForFunctionType(fun.tpe))

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ abstract class UnCurry extends InfoTransform`
`237`	`237`
`238`	`238`	`def canUseDelamdafyMethod = (`
`239`	`239`	`(inConstructorFlag == 0) // Avoiding synthesizing code prone to SI-6666, SI-8363 by using old-style lambda translation`
`240`		`- && (!isSpecialized \|\| (settings.target.value == "jvm-1.8")) // DelambdafyTransformer currently only emits generic FunctionN-s, use the old style in the meantime`
	`240`	`+ && (!isSpecialized \|\| (settings.isBCodeActive && settings.target.value == "jvm-1.8")) // DelambdafyTransformer currently only emits generic FunctionN-s, use the old style in the meantime`
`241`	`241`	`)`
`242`	`242`	`if (inlineFunctionExpansion \|\| !canUseDelamdafyMethod) {`
`243`	`243`	`val parents = addSerializable(abstractFunctionForFunctionType(fun.tpe))`