From 4645f86225c4697e4e46674d66174f7a716026f1 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <igor.chevdar@jetbrains.com>
Date: Tue, 17 Jul 2018 19:00:54 +0300
Subject: [PATCH] Fixed bug in inliner with default args + test

---
 .../kotlin/backend/konan/lower/FunctionInlining.kt |  7 ++++++-
 backend.native/tests/build.gradle                  |  5 +++++
 backend.native/tests/codegen/inline/defaultArgs.kt | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 backend.native/tests/codegen/inline/defaultArgs.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 7b912f36727..eb5bc8055c4 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
@@ -448,11 +448,16 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
              * 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.isInlinableLambdaArgument || it.isImmutableVariableLoad) {
+            if (it.isInlinableLambdaArgument) {
                 substituteMap[parameterDescriptor] = it.argumentExpression
                 return@forEach
             }
 
+            if (it.isImmutableVariableLoad) {
+                substituteMap[parameterDescriptor] = it.argumentExpression.transform(substitutor, data = null)   // Arguments may reference the previous ones - substitute them.
+                return@forEach
+            }
+
             val newVariable = currentScope.scope.createTemporaryVariable(                   // Create new variable and init it with the parameter expression.
                 irExpression = it.argumentExpression.transform(substitutor, data = null),   // Arguments may reference the previous ones - substitute them.
                 nameHint     = functionDeclaration.descriptor.name.toString(),
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index eda8d109c0a..88cc522ff2b 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -2466,6 +2466,11 @@ task inline_changingCapturedLocal(type: RunKonanTest) {
     source = "codegen/inline/changingCapturedLocal.kt"
 }
 
+task inline_defaultArgs(type: RunKonanTest) {
+    goldValue = "42\n"
+    source = "codegen/inline/defaultArgs.kt"
+}
+
 task deserialized_inline0(type: RunKonanTest) {
     source = "serialization/deserialized_inline0.kt"
 }
diff --git a/backend.native/tests/codegen/inline/defaultArgs.kt b/backend.native/tests/codegen/inline/defaultArgs.kt
new file mode 100644
index 00000000000..534b654a541
--- /dev/null
+++ b/backend.native/tests/codegen/inline/defaultArgs.kt
@@ -0,0 +1,14 @@
+package codegen.inline.defaultArgs
+
+import kotlin.test.*
+
+class Z
+
+inline fun Z.foo(x: Int = 42, y: Int = x) {
+    println(y)
+}
+
+@Test fun runTest() {
+    val z = Z()
+    z.foo()
+}
\ No newline at end of file