azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor. Drop always-false parameter in fix-stack utils

Browse Source
This commit is contained in:
Denis Zharkov
2017-05-12 15:44:08 +03:00
parent d362fa6eea
commit 4033786902
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackMethodTransformer.kt
+2 -2
View File
@@ -149,7 +149,7 @@ class FixStackMethodTransformer : MethodTransformer() {
val savedStackValues = analyzer.getStackToSpill(marker) val savedStackValues = analyzer.getStackToSpill(marker)
if (savedStackValues != null) { if (savedStackValues != null) {
val savedStackDescriptor = localVariablesManager.allocateVariablesForSaveStackMarker(marker, savedStackValues) val savedStackDescriptor = localVariablesManager.allocateVariablesForSaveStackMarker(marker, savedStackValues)
actions.add { saveStack(methodNode, marker, savedStackDescriptor, false) } actions.add { saveStack(methodNode, marker, savedStackDescriptor) }
} }
else { else {
// marker is dead code // marker is dead code
@@ -212,7 +212,7 @@ class FixStackMethodTransformer : MethodTransformer() {
val savedStackValues = analyzer.getStackToSpill(inlineMarker) val savedStackValues = analyzer.getStackToSpill(inlineMarker)
if (savedStackValues != null) { if (savedStackValues != null) {
val savedStackDescriptor = localVariablesManager.allocateVariablesForBeforeInlineMarker(inlineMarker, savedStackValues) val savedStackDescriptor = localVariablesManager.allocateVariablesForBeforeInlineMarker(inlineMarker, savedStackValues)
actions.add { saveStack(methodNode, inlineMarker, savedStackDescriptor, false) } actions.add { saveStack(methodNode, inlineMarker, savedStackDescriptor) }
} }
else { else {
// before inline marker is dead code // before inline marker is dead code
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
+5 -5
View File
@@ -41,13 +41,13 @@ class SavedStackDescriptor(
fun isNotEmpty(): Boolean = savedValues.isNotEmpty() fun isNotEmpty(): Boolean = savedValues.isNotEmpty()
} }
fun saveStack(methodNode: MethodNode, nodeToReplace: AbstractInsnNode, savedStackDescriptor: SavedStackDescriptor, fun saveStack(
restoreImmediately: Boolean) { methodNode: MethodNode,
nodeToReplace: AbstractInsnNode,
savedStackDescriptor: SavedStackDescriptor
) {
with(methodNode.instructions) { with(methodNode.instructions) {
generateStoreInstructions(methodNode, nodeToReplace, savedStackDescriptor) generateStoreInstructions(methodNode, nodeToReplace, savedStackDescriptor)
if (restoreImmediately) {
generateLoadInstructions(methodNode, nodeToReplace, savedStackDescriptor)
}
remove(nodeToReplace) remove(nodeToReplace)
} }
} }