Code clean, small refactorings and tests

#KT-8987 Fixed

compiler/testData/codegen/box/argumentOrder/captured.kt

@@ -0,0 +1,31 @@
+fun box(): String {
+    var invokeOrder = "";
+    val expectedResult = "0_1_9"
+    val expectedInvokeOrder = "1_0_9"
+    var l = 1L
+    var i = 0
+    val captured = 9L
+
+    var result = test(b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "$captured"; "$captured"})
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 1: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+    invokeOrder = "";
+    result = test(b = {invokeOrder += "1_"; l}(), c = {invokeOrder += "$captured"; "$captured"}, a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 2: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+    invokeOrder = "";
+    result = test(c = {invokeOrder += "$captured"; "$captured"}, b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 3: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+    invokeOrder = "";
+    result = test(a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "$captured"; "$captured"}, b = {invokeOrder += "1_"; l}())
+    if (invokeOrder != "0_1_9" || result != expectedResult) return "fail 4: $invokeOrder != 0_1_9 or $result != $expectedResult"
+
+    return "OK"
+}
+
+fun test(a: Int, b: Long, c: () -> String): String {
+    return { "${a}_${b}_${c()}"} ()
+}

compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt

@@ -0,0 +1,30 @@
+fun box(): String {
+    var invokeOrder = "";
+    val expectedResult = "1.0_0_1_9"
+    val expectedInvokeOrder = "1_0_9"
+    var l = 1L
+    var i = 0
+    val captured = 9L
+
+    var result = 1.0.test(b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "$captured"; "$captured"})
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 1: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+    invokeOrder = "";
+    result = 1.0.test(b = {invokeOrder += "1_"; l}(), c = {invokeOrder += "${captured}"; "${captured}"}, a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 2: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+    invokeOrder = "";
+    result = 1.0.test(c = {invokeOrder += "${captured}"; "${captured}"}, b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 3: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+    invokeOrder = "";
+    result = 1.0.test(a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "${captured}"; "${captured}"}, b = {invokeOrder += "1_"; l}())
+    if (invokeOrder != "0_1_9" || result != expectedResult) return "fail 4: $invokeOrder != 0_1_9 or $result != $expectedResult"
+
+    return "OK"
+}
+
+fun Double.test(a: Int, b: Long, c: () -> String): String {
+    return { "${this}_${a}_${b}_${c()}"} ()
+}

compiler/testData/codegen/box/argumentOrder/defaults.kt

@@ -0,0 +1,13 @@
+var invokeOrder: String = ""
+
+fun test(x: Double = { invokeOrder += "x"; 1.0 }(), a: String, y: Long = { invokeOrder += "y"; 1 }(), b: String): String {
+    return "" + x + a + b + y;
+}
+
+fun box(): String {
+    val funResult = test(b = { invokeOrder += "K"; "K" }(), a = { invokeOrder += "O"; "O" }())
+
+    if (invokeOrder != "KOxy" || funResult != "1.0OK1") return "fail: $invokeOrder != KOxy or $funResult != 1.0OK1"
+
+    return "OK"
+}

compiler/testData/codegen/box/argumentOrder/extension.kt

@@ -0,0 +1,30 @@
+fun box(): String {
+    var invokeOrder = "";
+    val expectedResult = "1.0_0_1_L"
+    val expectedInvokeOrder = "1_0_L"
+    var l = 1L
+    var i = 0
+
+    var result = 1.0.test(b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "L"; "L"})
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 1: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+    invokeOrder = "";
+    result = 1.0.test(b = {invokeOrder += "1_"; l}(), c = {invokeOrder += "L"; "L"}, a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 2: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+    invokeOrder = "";
+    result = 1.0.test(c = {invokeOrder += "L"; "L"}, b = {invokeOrder += "1_"; l}(), a = {invokeOrder+="0_"; i}())
+    if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 3: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+    invokeOrder = "";
+    result = 1.0.test(a = {invokeOrder+="0_"; i}(), c = {invokeOrder += "L"; "L"}, b = {invokeOrder += "1_"; l}())
+    if (invokeOrder != "0_1_L" || result != expectedResult) return "fail 4: $invokeOrder != 0_1_L or $result != $expectedResult"
+
+    return "OK"
+}
+
+fun Double.test(a: Int, b: Long, c: () -> String): String {
+    return "${this}_${a}_${b}_${c()}"
+}

compiler/testData/codegen/box/argumentOrder/extensionInClass.kt

@@ -0,0 +1,37 @@
+fun box(): String {
+    return Z().test()
+}
+
+class Z {
+    fun Double.test(a: Int, b: Long, c: () -> String): String {
+        return "${this}_${a}_${b}_${c()}"
+    }
+
+
+    fun test(): String {
+        var invokeOrder = "";
+        val expectedResult = "1.0_0_1_L"
+        val expectedInvokeOrder = "1_0_L"
+        var l = 1L
+        var i = 0
+
+        var result = 1.0.test(b = { invokeOrder += "1_"; l }(), a = { invokeOrder += "0_"; i }(), c = { invokeOrder += "L"; "L" })
+        if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 1: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+        invokeOrder = "";
+        result = 1.0.test(b = { invokeOrder += "1_"; l }(), c = { invokeOrder += "L"; "L" }, a = { invokeOrder += "0_"; i }())
+        if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 2: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+        invokeOrder = "";
+        result = 1.0.test(c = { invokeOrder += "L"; "L" }, b = { invokeOrder += "1_"; l }(), a = { invokeOrder += "0_"; i }())
+        if (invokeOrder != expectedInvokeOrder || result != expectedResult) return "fail 3: $invokeOrder != $expectedInvokeOrder or $result != $expectedResult"
+
+
+        invokeOrder = "";
+        result = 1.0.test(a = { invokeOrder += "0_"; i }(), c = { invokeOrder += "L"; "L" }, b = { invokeOrder += "1_"; l }())
+        if (invokeOrder != "0_1_L" || result != expectedResult) return "fail 4: $invokeOrder != 0_1_L or $result != $expectedResult"
+
+        return "OK"
+    }
+}

compiler/testData/codegen/box/argumentOrder/lambdaMigration.kt

@@ -0,0 +1,21 @@
+fun box(): String {
+    var res = "";
+    var call = test(a = {res += "K"; "K"}(), b = {res+="O"; "O"}(), c = {res += "L"; "L"})
+    if (res != "KOL" || call != "KOL") return "fail 1: $res != KOL or $call != KOL"
+
+    res = "";
+    call = test(a = {res += "K"; "K"}(), c = {res += "L"; "L"}, b = {res+="O"; "O"}())
+    if (res != "KOL" || call != "KOL") return "fail 2: $res != KOL or $call != KOL"
+
+
+    res = "";
+    call = test(c = {res += "L"; "L"}, a = {res += "K"; "K"}(), b = {res+="O"; "O"}())
+    if (res != "KOL" || call != "KOL") return "fail 3: $res != KOL or $call != KOL"
+
+    return "OK"
+
+}
+
+fun test(a: String, b: String, c: () -> String): String {
+    return a + b + c();
+}

compiler/testData/codegen/box/argumentOrder/lambdaMigrationInClass.kt

@@ -0,0 +1,25 @@
+fun box(): String {
+    var res = "";
+    var call = Z("Z").test(a = {res += "K"; "K"}(), b = {res+="O"; "O"}(), c = {res += "L"; "L"})
+    if (res != "KOL" || call != "KOLZ") return "fail 1: $res != KOL or $call != KOLZ"
+
+    res = "";
+    call = Z("Z").test(a = {res += "K"; "K"}(), c = {res += "L"; "L"}, b = {res+="O"; "O"}())
+    if (res != "KOL" || call != "KOLZ") return "fail 2: $res != KOL or $call != KOLZ"
+
+
+    res = "";
+    call = Z("Z").test(c = {res += "L"; "L"}, a = {res += "K"; "K"}(), b = {res+="O"; "O"}())
+    if (res != "KOL" || call != "KOLZ") return "fail 3: $res != KOL or $call != KOLZ"
+
+    return "OK"
+
+}
+
+class Z(val p: String) {
+
+    fun test(a: String, b: String, c: () -> String): String {
+        return a + b + c() + p;
+    }
+
+}

compiler/testData/codegen/box/argumentOrder/simple.kt

@@ -0,0 +1,21 @@
+fun box(): String {
+    var res = "";
+    var call = test(b = {res += "K"; "K"}(), a = {res+="O"; "O"}(), c = {res += "L"; "L"})
+    if (res != "KOL" || call != "OKL") return "fail 1: $res != KOL or $call != OKL"
+
+    res = "";
+    call = test(b = {res += "K"; "K"}(), c = {res += "L"; "L"}, a = {res+="O"; "O"}())
+    if (res != "KOL" || call != "OKL") return "fail 2: $res != KOL or $call != OKL"
+
+
+    res = "";
+    call = test(c = {res += "L"; "L"}, b = {res += "K"; "K"}(), a = {res+="O"; "O"}())
+    if (res != "KOL" || call != "OKL") return "fail 3: $res != KOL or $call != OKL"
+
+    return "OK"
+
+}
+
+fun test(a: String, b: String, c: () -> String): String {
+    return a + b + c();
+}

compiler/testData/codegen/box/argumentOrder/simpleInClass.kt

@@ -0,0 +1,23 @@
+fun box(): String {
+    var res = "";
+    var call = Z("Z").test(b = {res += "K"; "K"}(), a = {res+="O"; "O"}(), c = {res += "L"; "L"})
+    if (res != "KOL" || call != "OKLZ") return "fail 1: $res != KOL or $call != OKLZ"
+
+    res = "";
+    call = Z("Z").test(b = {res += "K"; "K"}(), c = {res += "L"; "L"}, a = {res+="O"; "O"}())
+    if (res != "KOL" || call != "OKLZ") return "fail 2: $res != KOL or $call != OKLZ"
+
+
+    res = "";
+    call = Z("Z").test(c = {res += "L"; "L"}, b = {res += "K"; "K"}(), a = {res+="O"; "O"}())
+    if (res != "KOL" || call != "OKLZ") return "fail 3: $res != KOL or $call != OKLZ"
+
+    return "OK"
+
+}
+
+class Z(val p: String) {
+    fun test(a: String, b: String, c: () -> String): String {
+        return a + b + c() + p;
+    }
+}

compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorder.kt

@@ -0,0 +1,11 @@
+class A {
+    fun test(x: String?, a: String?, b: String?){}
+
+    fun box(): String {
+        test(x = "x", b = "K", a = "O")
+        return "OK"
+    }
+}
+// Test argument reordering when call site argument order differs from declaration one
+// 4 LOAD
+// 2 STORE

compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorderWithDefault.kt

@@ -0,0 +1,13 @@
+class A {
+    fun test(x: String? = "x", a: String?, b: String?, y: String? = "y") {
+
+    }
+
+    fun box(): String {
+        test(b = "K", a = "O")
+        return "OK"
+    }
+}
+// Test argument reordering when call site argument order differs from declaration one
+// 12 LOAD
+// 5 STORE

compiler/testData/codegen/bytecodeText/argumentOrder/sameOrder.kt

@@ -0,0 +1,12 @@
+class A {
+    fun test(x: String?, a: String?, b: String?) {
+    }
+
+    fun box(): String {
+        test(x = "x", a = "O", b = "K")
+        return "OK"
+    }
+}
+// Test there is no argument reordering when call site argument order same as declaration one
+// 2 LOAD
+// 0 STORE

compiler/testData/codegen/bytecodeText/argumentOrder/sameOrderWithDefault.kt

@@ -0,0 +1,12 @@
+class A {
+    fun test(x: String? = "x", a: String?, b: String?, y: String? = "y") {
+    }
+
+    fun box(): String {
+        test(a = "O", b = "K")
+        return "OK"
+    }
+}
+// Test there is no argument reordering when call site argument order same as declaration one
+// 9 LOAD
+// 2 STORE