From b58d75440b73141b8dbe2616739a342ef5b9f9f4 Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Fri, 2 Oct 2020 00:01:21 +0000 Subject: [PATCH] [FIR] Fix tests for vararg execution order after rebase. --- ...FirBlackBoxInlineCodegenTestGenerated.java | 10 ++++ .../codegen/box/argumentOrder/kt17691.kt | 1 - .../kt17691WithEnabledFeature.kt | 1 - .../defaultParametersAndLastVararg.kt | 8 +-- ...ParametersAndLastVarargWithCorrectOrder.kt | 55 +++++++++++++++++++ .../varargAndDefaultParameters.kt | 8 +-- ...argAndDefaultParametersWithCorrectOrder.kt | 54 ++++++++++++++++++ .../BlackBoxInlineCodegenTestGenerated.java | 10 ++++ ...otlinAgainstInlineKotlinTestGenerated.java | 10 ++++ .../IrBlackBoxInlineCodegenTestGenerated.java | 10 ++++ ...otlinAgainstInlineKotlinTestGenerated.java | 10 ++++ ...JvmIrAgainstOldBoxInlineTestGenerated.java | 10 ++++ ...JvmOldAgainstIrBoxInlineTestGenerated.java | 10 ++++ .../IrJsCodegenInlineES6TestGenerated.java | 10 ++++ .../IrJsCodegenInlineTestGenerated.java | 10 ++++ .../JsCodegenInlineTestGenerated.java | 10 ++++ 16 files changed, 217 insertions(+), 10 deletions(-) create mode 100644 compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt create mode 100644 compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt diff --git a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java index 1b394d9ca3d..a6281b07b01 100644 --- a/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxInlineCodegenTestGenerated.java +++ b/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") diff --git a/compiler/testData/codegen/box/argumentOrder/kt17691.kt b/compiler/testData/codegen/box/argumentOrder/kt17691.kt index 349bd79cbd9..4bfaf9fb8b5 100644 --- a/compiler/testData/codegen/box/argumentOrder/kt17691.kt +++ b/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" } diff --git a/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt b/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt index 405ccda5630..48c994256fa 100644 --- a/compiler/testData/codegen/box/argumentOrder/kt17691WithEnabledFeature.kt +++ b/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) {} diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt index b9f1a7f9e0a..09cc2734835 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVararg.kt +++ b/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 receiverconstraints") return "fail 4: $invokeOrder" + if (invokeOrder != "init receiver constraints") return "fail 4: $invokeOrder" result = "" invokeOrder = "" diff --git a/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt b/compiler/testData/codegen/boxInline/argumentOrder/defaultParametersAndLastVarargWithCorrectOrder.kt new file mode 100644 index 00000000000..fd92edb8b60 --- /dev/null +++ b/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" +} + diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt index b64b188da45..43223e68c0a 100644 --- a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParameters.kt +++ b/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 receiverconstraints") return "fail 4: $invokeOrder" + if (invokeOrder != "init receiver constraints") return "fail 4: $invokeOrder" result = "" invokeOrder = "" diff --git a/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt b/compiler/testData/codegen/boxInline/argumentOrder/varargAndDefaultParametersWithCorrectOrder.kt new file mode 100644 index 00000000000..44b4ee8548d --- /dev/null +++ b/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" +} + diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java index d4cf706733b..35cc4be4129 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java index 6e06ed0de64..96a19a25996 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java index 54a1f12b9ab..4e783872460 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java index 33537d5f106..e9f493281b0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java index da01b403bd8..8fb9686c6d0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxInlineTestGenerated.java +++ b/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") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java index a01ee8fa6bb..c3bc523f799 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxInlineTestGenerated.java +++ b/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") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java index ae805af5fdd..55cfc7f6e3f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenInlineES6TestGenerated.java +++ b/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") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java index d81c1c4a95f..15fe8b01782 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java +++ b/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") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java index 112117b3a96..9856d8e3174 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java +++ b/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")