diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-05-30 14:38:50 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-06-06 14:34:57 +1000 |
| commit | 1f812e9482855d3fd5a8a5e9118942dc80f22db5 (patch) | |
| tree | 2aa13db16bb9b32028ac277632d9b54627da2269 /src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala | |
| parent | 3bb735823f6815002895b1a335c6d105ddbe3e9e (diff) | |
| download | scala-1f812e9482855d3fd5a8a5e9118942dc80f22db5.tar.gz scala-1f812e9482855d3fd5a8a5e9118942dc80f22db5.tar.bz2 scala-1f812e9482855d3fd5a8a5e9118942dc80f22db5.zip | |
Avoid separate traversal in inliner to remove line number nodes
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 | 6 |
1 files changed, 1 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 809b9e310d..d18963ec8b 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala @@ -268,11 +268,7 @@ class Inliner[BT <: BTypes](val btypes: BT) { // New labels for the cloned instructions val labelsMap = cloneLabels(callee) - val (clonedInstructions, instructionMap, hasSerializableClosureInstantiation) = cloneInstructions(callee, labelsMap) - val keepLineNumbers = callsiteClass == calleeDeclarationClass - if (!keepLineNumbers) { - removeLineNumberNodes(clonedInstructions) - } + val (clonedInstructions, instructionMap, hasSerializableClosureInstantiation) = cloneInstructions(callee, labelsMap, keepLineNumbers = callsiteClass == calleeDeclarationClass) // local vars in the callee are shifted by the number of locals at the callsite val localVarShift = callsiteMethod.maxLocals |