diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-20 11:57:23 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-20 11:57:23 +0200 |
| commit | 0c360f6d285fdea1fb240248b6c857cc942fbede (patch) | |
| tree | f2191628abb493f0ae46fcf0fc9cbaeb70511466 | |
| parent | 7f24266f0ae738be2db8959747f82726ebfe03b9 (diff) | |
| parent | 6322d1b9e7ffddf16baf8166eba911d7db4927e0 (diff) | |
| download | scala-0c360f6d285fdea1fb240248b6c857cc942fbede.tar.gz scala-0c360f6d285fdea1fb240248b6c857cc942fbede.tar.bz2 scala-0c360f6d285fdea1fb240248b6c857cc942fbede.zip | |
Merge pull request #4508 from retronym/topic/uncurry-specialized
Avoid inefficient specialied lambdas w. delambdafy jvm-1.8, GenASM
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/UnCurry.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index 1020b98bb9..b310e6c3a1 100644 --- 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)) |