From b92fbe7f427d74d374e7d8b3d54d4cbade93a04f Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Fri, 8 Jun 2018 17:18:10 +0300
Subject: [PATCH] Fixed bug in inliner + test

---
 .../backend/konan/lower/FunctionInlining.kt   | 14 +++++++++--
 backend.native/tests/build.gradle             |  5 ++++
 .../codegen/inline/changingCapturedLocal.kt   | 25 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 backend.native/tests/codegen/inline/changingCapturedLocal.kt

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
index c20ce131513..6663e0bec3d 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
@@ -275,6 +275,11 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
                 if (irCallableReference !is IrCallableReference) return false               // Second statement of the block must be CallableReference.
                 return true                                                                 // The expression represents lambda.
             }
+
+        val isImmutableVariableLoad: Boolean
+            get() = argumentExpression.let {
+                it is IrGetValue && !it.descriptor.let { it is VariableDescriptor && it.isVar }
+            }
     }
 
     //-------------------------------------------------------------------------//
@@ -366,8 +371,13 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
         parameterToArgumentOld.forEach {
             val parameterDescriptor = it.parameterDescriptor
 
-            if (it.isInlinableLambda || it.argumentExpression is IrGetValue) {              // If argument is inlinable lambda. IrGetValue is skipped because of recursive inline.
-                substituteMap[parameterDescriptor] = it.argumentExpression                  // Associate parameter with lambda argument.
+            /*
+             * We need to create temporary variable for each argument except inlinable lambdas.
+             * For simplicity and to produce simpler IR we don't create temporaries for every immutable variable,
+             * not only for those referring to inlinable lambdas.
+             */
+            if (it.isInlinableLambda || it.isImmutableVariableLoad) {
+                substituteMap[parameterDescriptor] = it.argumentExpression
                 return@forEach
             }
 
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 5b108a7db13..8027c3d41f1 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -2373,6 +2373,11 @@ task inline_returnLocalClassFromBlock(type: RunKonanTest) {
     source = "codegen/inline/returnLocalClassFromBlock.kt"
 }
 
+task inline_changingCapturedLocal(type: RunKonanTest) {
+    goldValue = "OK\n"
+    source = "codegen/inline/changingCapturedLocal.kt"
+}
+
 task deserialized_inline0(type: RunKonanTest) {
     source = "serialization/deserialized_inline0.kt"
 }
diff --git a/backend.native/tests/codegen/inline/changingCapturedLocal.kt b/backend.native/tests/codegen/inline/changingCapturedLocal.kt
new file mode 100644
index 00000000000..5ec614f9304
--- /dev/null
+++ b/backend.native/tests/codegen/inline/changingCapturedLocal.kt
@@ -0,0 +1,25 @@
+package codegen.inline.changingCapturedLocal
+
+import kotlin.test.*
+
+var log = ""
+
+inline fun foo(x: Int, action: (Int) -> Unit) = action(x)
+
+fun box(): String {
+    var x = 23
+    foo(x) {
+        log += "$it;"
+        x++
+        log += "$it;"
+    }
+
+    if (log != "23;23;") return "fail1: $log"
+    if (x != 24) return "fail2: $x"
+
+    return "OK"
+}
+
+@Test fun runTest() {
+    println(box())
+}
\ No newline at end of file