diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-08-12 16:24:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-12 16:24:47 -0700 |
| commit | 3e0b2c2b14bdc26a40887af7a375077565f004b3 (patch) | |
| tree | 9886fbcfc6edc3ec069fdf2994cfc1694e4640c2 /src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala | |
| parent | 618d42c747955a43557655bdc0c4281fec5a7923 (diff) | |
| parent | 131402fd5fe8c064ef5cfffbe568507cbdf37990 (diff) | |
| download | scala-3e0b2c2b14bdc26a40887af7a375077565f004b3.tar.gz scala-3e0b2c2b14bdc26a40887af7a375077565f004b3.tar.bz2 scala-3e0b2c2b14bdc26a40887af7a375077565f004b3.zip | |
Merge pull request #5321 from retronym/topic/lock-down-deserialize
SD-193 Lock down lambda deserialization
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala b/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala index 50dd65c56c..b7523bbf06 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala @@ -277,7 +277,7 @@ class Inliner[BT <: BTypes](val btypes: BT) { } case _ => false } - val (clonedInstructions, instructionMap, hasSerializableClosureInstantiation) = cloneInstructions(callee, labelsMap, keepLineNumbers = sameSourceFile) + val (clonedInstructions, instructionMap, targetHandles) = cloneInstructions(callee, labelsMap, keepLineNumbers = sameSourceFile) // local vars in the callee are shifted by the number of locals at the callsite val localVarShift = callsiteMethod.maxLocals @@ -405,10 +405,7 @@ class Inliner[BT <: BTypes](val btypes: BT) { callsiteMethod.maxStack = math.max(callsiteMethod.maxStack, math.max(stackHeightAtNullCheck, maxStackOfInlinedCode)) - if (hasSerializableClosureInstantiation && !indyLambdaHosts(callsiteClass.internalName)) { - indyLambdaHosts += callsiteClass.internalName - addLambdaDeserialize(byteCodeRepository.classNode(callsiteClass.internalName).get) - } + addIndyLambdaImplMethod(callsiteClass.internalName, targetHandles) callGraph.addIfMissing(callee, calleeDeclarationClass) |