From 4033786902af6130b69c48e10007aeede792990f Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 12 May 2017 15:44:08 +0300
Subject: [PATCH] Minor. Drop always-false parameter in fix-stack utils

---
 .../optimization/fixStack/FixStackMethodTransformer.kt |  4 ++--
 .../optimization/fixStack/StackTransformationUtils.kt  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackMethodTransformer.kt
index c110187480e..f9bc09d7bc0 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/FixStackMethodTransformer.kt
@@ -149,7 +149,7 @@ class FixStackMethodTransformer : MethodTransformer() {
         val savedStackValues = analyzer.getStackToSpill(marker)
         if (savedStackValues != null) {
             val savedStackDescriptor = localVariablesManager.allocateVariablesForSaveStackMarker(marker, savedStackValues)
-            actions.add { saveStack(methodNode, marker, savedStackDescriptor, false) }
+            actions.add { saveStack(methodNode, marker, savedStackDescriptor) }
         }
         else {
             // marker is dead code
@@ -212,7 +212,7 @@ class FixStackMethodTransformer : MethodTransformer() {
         val savedStackValues = analyzer.getStackToSpill(inlineMarker)
         if (savedStackValues != null) {
             val savedStackDescriptor = localVariablesManager.allocateVariablesForBeforeInlineMarker(inlineMarker, savedStackValues)
-            actions.add { saveStack(methodNode, inlineMarker, savedStackDescriptor, false) }
+            actions.add { saveStack(methodNode, inlineMarker, savedStackDescriptor) }
         }
         else {
             // before inline marker is dead code
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
index 49c4f39b58b..e98c4c720a4 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/fixStack/StackTransformationUtils.kt
@@ -41,13 +41,13 @@ class SavedStackDescriptor(
     fun isNotEmpty(): Boolean = savedValues.isNotEmpty()
 }
 
-fun saveStack(methodNode: MethodNode, nodeToReplace: AbstractInsnNode, savedStackDescriptor: SavedStackDescriptor,
-              restoreImmediately: Boolean) {
+fun saveStack(
+        methodNode: MethodNode,
+        nodeToReplace: AbstractInsnNode,
+        savedStackDescriptor: SavedStackDescriptor
+) {
     with(methodNode.instructions) {
         generateStoreInstructions(methodNode, nodeToReplace, savedStackDescriptor)
-        if (restoreImmediately) {
-            generateLoadInstructions(methodNode, nodeToReplace, savedStackDescriptor)
-        }
         remove(nodeToReplace)
     }
 }