[FIR] Fix tests for vararg execution order after rebase.

compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java

@@ -594,6 +594,11 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class FirBlackBoxInlineCodegenTestGenerated extends AbstractFirBlackBoxIn
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

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

@@ -17,5 +17,4 @@ fun box(): String {
     foo(*arrayOf({ acc4 += "1" }()), y = { acc4 += "2" }())
 
     return if (acc1 == "12" && acc2 == "21" && acc3 == "21" && acc4 == "12") "OK" else "ERROR"
-    return "OK"
 }

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

@@ -1,7 +1,6 @@
 // !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments
 // WITH_RUNTIME
 // KJS_WITH_FULL_RUNTIME
-// IGNORE_BACKEND_FIR: JVM_IR
 
 fun foo(vararg x: Unit, y: Any) {}
 

compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt

@@ -1,4 +1,6 @@
+// !LANGUAGE: -UseCorrectExecutionOrderForVarargArguments
 // IGNORE_BACKEND: JS
+// IGNORE_BACKEND_FIR: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 // WITH_RUNTIME
@@ -32,18 +34,16 @@ fun box(): String {
                        init = { invokeOrder += " init"; "I" }())
     if (result != "C, R, I") return "fail 1: $result"
 
-    //Change test after KT-17691 FIX
     if (invokeOrder != " receiver initconstraints") return "fail 2: $invokeOrder"
 
     result = ""
     invokeOrder = ""
     result = inlineFun(init = { invokeOrder += "init"; "I" }(),
-                       constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()),
                        receiver = { invokeOrder += " receiver"; "R" }()
     )
     if (result != "C, R, I") return "fail 3: $result"
-    //Change test after KT-17691 FIX
+    if (invokeOrder != "init receiver constraints") return "fail 4: $invokeOrder"
-    if (invokeOrder != "init receiverconstraints") return "fail 4: $invokeOrder"
 
     result = ""
     invokeOrder = ""

compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt

@@ -0,0 +1,55 @@
+// !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments
+// NO_CHECK_LAMBDA_INLINING
+// FILE: 1.kt
+// WITH_RUNTIME
+// KJS_WITH_FULL_RUNTIME
+
+package test
+
+open class A(val value: String)
+
+var invokeOrder = ""
+
+inline fun inlineFun(
+        receiver: String = { invokeOrder += " default receiver"; "DEFAULT" }(),
+        init: String,
+        vararg constraints: A
+): String {
+    return constraints.map { it.value }.joinToString() + ", " + receiver + ", " + init
+}
+
+// FILE: 2.kt
+import test.*
+
+
+var result = ""
+fun box(): String {
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()),
+                       receiver = { invokeOrder += " receiver"; "R" }(),
+                       init = { invokeOrder += " init"; "I" }())
+    if (result != "C, R, I") return "fail 1: $result"
+
+    if (invokeOrder != "constraints receiver init") return "fail 2: $invokeOrder"
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(init = { invokeOrder += "init"; "I" }(),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()),
+                       receiver = { invokeOrder += " receiver"; "R" }()
+    )
+    if (result != "C, R, I") return "fail 3: $result"
+    if (invokeOrder != "init constraints receiver") return "fail 4: $invokeOrder"
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(init = { invokeOrder += "init"; "I" }(),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()))
+    if (result != "C, DEFAULT, I") return "fail 5: $result"
+    if (invokeOrder != "init constraints default receiver") return "fail 6: $invokeOrder"
+
+    return "OK"
+}
+

compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt

@@ -1,7 +1,9 @@
+// !LANGUAGE: -UseCorrectExecutionOrderForVarargArguments
 // IGNORE_BACKEND: JVM_IR
 // IGNORE_BACKEND: JS, JS_IR
 // IGNORE_BACKEND: JS_IR_ES6
 // IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
+// IGNORE_BACKEND_FIR: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 // WITH_RUNTIME
@@ -35,18 +37,16 @@ fun box(): String {
                        init = { invokeOrder += " init"; "I" }())
     if (result != "C, R, I") return "fail 1: $result"
 
-    //Change test after KT-17691 FIX; and remove cloned test for Native (enable this).
     if (invokeOrder != " receiver initconstraints") return "fail 2: $invokeOrder"
 
     result = ""
     invokeOrder = ""
     result = inlineFun(init = { invokeOrder += "init"; "I" }(),
-                       constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()),
                        receiver = { invokeOrder += " receiver"; "R" }()
     )
     if (result != "C, R, I") return "fail 3: $result"
-    //Change test after KT-17691 FIX
+    if (invokeOrder != "init receiver constraints") return "fail 4: $invokeOrder"
-    if (invokeOrder != "init receiverconstraints") return "fail 4: $invokeOrder"
 
     result = ""
     invokeOrder = ""

compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt

@@ -0,0 +1,54 @@
+// !LANGUAGE: +UseCorrectExecutionOrderForVarargArguments
+// NO_CHECK_LAMBDA_INLINING
+// FILE: 1.kt
+// WITH_RUNTIME
+// KJS_WITH_FULL_RUNTIME
+package test
+
+open class A(val value: String)
+
+var invokeOrder = ""
+
+inline fun inlineFun(
+        vararg constraints: A,
+        receiver: String = { invokeOrder += " default receiver"; "DEFAULT" }(),
+        init: String
+): String {
+    return constraints.map { it.value }.joinToString() + ", " + receiver + ", " + init
+}
+
+// FILE: 2.kt
+import test.*
+
+
+var result = ""
+fun box(): String {
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(constraints = *arrayOf({ invokeOrder += "constraints";A("C") }()),
+                       receiver = { invokeOrder += " receiver"; "R" }(),
+                       init = { invokeOrder += " init"; "I" }())
+    if (result != "C, R, I") return "fail 1: $result"
+
+    if (invokeOrder != "constraints receiver init") return "fail 2: $invokeOrder"
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(init = { invokeOrder += "init"; "I" }(),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()),
+                       receiver = { invokeOrder += " receiver"; "R" }()
+    )
+    if (result != "C, R, I") return "fail 3: $result"
+    if (invokeOrder != "init constraints receiver") return "fail 4: $invokeOrder"
+
+    result = ""
+    invokeOrder = ""
+    result = inlineFun(init = { invokeOrder += "init"; "I" }(),
+                       constraints = *arrayOf({ invokeOrder += " constraints";A("C") }()))
+    if (result != "C, DEFAULT, I") return "fail 5: $result"
+    if (invokeOrder != "init constraints default receiver") return "fail 6: $invokeOrder"
+
+    return "OK"
+}
+

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java

@@ -594,6 +594,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -594,6 +594,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java

@@ -594,6 +594,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -594,6 +594,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java

@@ -594,6 +594,11 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java

@@ -594,6 +594,11 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -628,6 +633,11 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java

@@ -534,6 +534,11 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -568,6 +573,11 @@ public class IrJsCodegenInlineES6TestGenerated extends AbstractIrJsCodegenInline
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java

@@ -534,6 +534,11 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -568,6 +573,11 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java

@@ -534,6 +534,11 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt");
         }
 
+        @TestMetadata("defaultParametersAndLastVarargWithCorrectOrder.kt")
+        public void testDefaultParametersAndLastVarargWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt");
+        }
+
         @TestMetadata("extension.kt")
         public void testExtension() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/extension.kt");
@@ -568,6 +573,11 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
         public void testVarargAndDefaultParameters() throws Exception {
             runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt");
         }
+
+        @TestMetadata("varargAndDefaultParametersWithCorrectOrder.kt")
+        public void testVarargAndDefaultParametersWithCorrectOrder() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt");
+        }
     }
 
     @TestMetadata("compiler/testData/codegen/boxInline/arrayConvention")