From 295f71a29cfb35d7b2bf662f92ccaaf8e01de774 Mon Sep 17 00:00:00 2001
From: Igor Chevdar <homuroll@yandex.ru>
Date: Sun, 21 Jan 2018 23:28:19 +0300
Subject: [PATCH] Fixed inline call arguments evaluation + test

---
 .../backend/konan/lower/FunctionInlining.kt       |  4 ++--
 backend.native/tests/build.gradle                 |  5 +++++
 .../tests/codegen/inline/lambdaInDefaultValue.kt  | 15 +++++++++++++++
 samples/globalState/src/main/kotlin/Global.kt     |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 backend.native/tests/codegen/inline/lambdaInDefaultValue.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 ecde64e6e67..8f2c6d66f19 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
@@ -125,13 +125,13 @@ private class Inliner(val globalSubstituteMap: MutableMap<DeclarationDescriptor,
     private fun inlineFunction(irCall             : IrCall,                                 // Call to be substituted.
                                functionDeclaration: IrFunction): IrReturnableBlockImpl {    // Function to substitute.
 
-        val evaluationStatements = evaluateArguments(irCall, functionDeclaration)           // And list of evaluation statements.
-
         val copyFunctionDeclaration = copyIrElement.copy(                                   // Create copy of original function.
             irElement       = functionDeclaration,                                          // Descriptors declared inside the function will be copied.
             typeSubstitutor = createTypeSubstitutor(irCall)                                 // Type parameters will be substituted with type arguments.
         ) as IrFunction
 
+        val evaluationStatements = evaluateArguments(irCall, copyFunctionDeclaration)           // And list of evaluation statements.
+
         val statements = (copyFunctionDeclaration.body as IrBlockBody).statements           // IR statements from function copy.
         val returnType = copyFunctionDeclaration.descriptor.returnType!!                    // Substituted return type.
         val sourceFileName = context.ir.originalModuleIndex.declarationToFile[functionDeclaration.descriptor.original]?:""
diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle
index 93845201224..51e41e29cca 100644
--- a/backend.native/tests/build.gradle
+++ b/backend.native/tests/build.gradle
@@ -2096,6 +2096,11 @@ task inline_localFunctionInInitializerBlock(type: RunKonanTest) {
     source = "codegen/inline/localFunctionInInitializerBlock.kt"
 }
 
+task inline_lambdaInDefaultValue(type: RunKonanTest) {
+    goldValue = "OK\n"
+    source = "codegen/inline/lambdaInDefaultValue.kt"
+}
+
 task deserialized_inline0(type: RunKonanTest) {
     source = "serialization/deserialized_inline0.kt"
 }
diff --git a/backend.native/tests/codegen/inline/lambdaInDefaultValue.kt b/backend.native/tests/codegen/inline/lambdaInDefaultValue.kt
new file mode 100644
index 00000000000..0ac0689cd45
--- /dev/null
+++ b/backend.native/tests/codegen/inline/lambdaInDefaultValue.kt
@@ -0,0 +1,15 @@
+package codegen.inline.lambdaInDefaultValue
+
+import kotlin.test.*
+
+inline fun inlineFun(param: String, lambda: (String) -> String = { it }): String {
+    return lambda(param)
+}
+
+fun box(): String {
+    return inlineFun("OK")
+}
+
+@Test fun runTest() {
+    println(box())
+}
\ No newline at end of file
diff --git a/samples/globalState/src/main/kotlin/Global.kt b/samples/globalState/src/main/kotlin/Global.kt
index 64fce7ac530..6a0edaf4c78 100644
--- a/samples/globalState/src/main/kotlin/Global.kt
+++ b/samples/globalState/src/main/kotlin/Global.kt
@@ -18,7 +18,7 @@ import global.*
 import kotlinx.cinterop.*
 import platform.posix.*
 
-fun Int.ensureUnixCallResult(op: String, predicate: (Int) -> Boolean = { x -> x == 0} ): Int {
+inline fun Int.ensureUnixCallResult(op: String, predicate: (Int) -> Boolean = { x -> x == 0} ): Int {
     if (!predicate(this)) {
         throw Error("$op: ${strerror(posix_errno())!!.toKString()}")
     }