diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index fcb2cb5340a..953ccfd62cf 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -10245,6 +10245,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @Test + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @Test @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { @@ -10257,12 +10263,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @Test @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index 6194bc0619c..fc73df212e7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -10245,6 +10245,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @Test + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @Test @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { @@ -10257,12 +10263,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @Test @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/coroutines/AddContinuationToFunctionsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/coroutines/AddContinuationToFunctionsLowering.kt index 51dd501b345..5335c6f8fe0 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/coroutines/AddContinuationToFunctionsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/coroutines/AddContinuationToFunctionsLowering.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.DeclarationTransformer import org.jetbrains.kotlin.backend.common.getOrPut import org.jetbrains.kotlin.backend.common.ir.* +import org.jetbrains.kotlin.backend.common.lower.VariableRemapper import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.IrStatement @@ -71,8 +72,11 @@ class AddContinuationToLocalSuspendFunctionsLowering(val context: CommonBackendC private fun transformSuspendFunction(context: CommonBackendContext, function: IrSimpleFunction): IrSimpleFunction { val newFunctionWithContinuation = function.getOrCreateFunctionWithContinuationStub(context) // Using custom mapping because number of parameters doesn't match - val parameterMapping = function.explicitParameters.zip(newFunctionWithContinuation.explicitParameters).toMap() + val parameterMapping : Map = function.explicitParameters.zip(newFunctionWithContinuation.explicitParameters).toMap() val newBody = function.moveBodyTo(newFunctionWithContinuation, parameterMapping) + for ((old, new) in parameterMapping.entries) { + new.defaultValue = old.defaultValue?.transform(VariableRemapper(parameterMapping), null) + } // Since we are changing return type to Any, function can no longer return unit implicitly. if ( @@ -129,11 +133,6 @@ private fun IrSimpleFunction.createSuspendFunctionStub(context: CommonBackendCon } function.valueParameters = valueParameters.memoryOptimizedMap { it.copyTo(function) } - val mapping = mutableMapOf() - valueParameters.forEach { mapping[it.symbol] = function.valueParameters[it.index].symbol } - val remapper = ValueRemapper(mapping) - function.valueParameters.forEach { it.defaultValue = it.defaultValue?.transform(remapper, null) } - function.addValueParameter { startOffset = function.startOffset endOffset = function.endOffset diff --git a/compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt b/compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt similarity index 65% rename from compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt rename to compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt index 6386e84b5cb..a58844de468 100644 --- a/compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt +++ b/compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt @@ -14,6 +14,14 @@ class Controller1 { x.resume(block()) COROUTINE_SUSPENDED } + suspend fun getDef() = "DEF2" + suspend fun suspendHere2(block : suspend () -> String = { getDef() }): String { + val result = block() + return suspendCoroutineUninterceptedOrReturn { x -> + x.resume(result) + COROUTINE_SUSPENDED + } + } } fun builder1(c: suspend Controller1.() -> Unit) { @@ -34,6 +42,10 @@ fun box(): String { result = "FAIL" return@builder1 } + if (suspendHere2() != "DEF2") { + result = "FAIL" + return@builder1 + } result = suspendHere { "OK" } } if (result != "OK") return result @@ -44,6 +56,10 @@ fun box(): String { result = "FAIL" return@builder2 } + if (suspendHere2() != "DEF2") { + result = "FAIL" + return@builder2 + } result = suspendHere { "OK" } } @@ -62,6 +78,14 @@ class Controller2 { x.resume(block()) COROUTINE_SUSPENDED } + suspend fun getDef() = "DEF2" + suspend fun suspendHere2(block : suspend () -> String = { getDef() }): String { + val result = block() + return suspendCoroutineUninterceptedOrReturn { x -> + x.resume(result) + COROUTINE_SUSPENDED + } + } } fun builder2(c: suspend Controller2.() -> Unit) { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 7ca5b3f33d3..c0cead7105d 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -9987,6 +9987,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @Test + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @Test @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { @@ -9999,12 +10005,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @Test @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index f59907a9ace..15d2a45863f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -10245,6 +10245,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @Test + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @Test @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { @@ -10257,12 +10263,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @Test @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 029ad2fb6b7..b557c937368 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -10245,6 +10245,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @Test + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @Test @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { @@ -10257,12 +10263,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @Test @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 0471370621b..1be2f1c8190 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -7882,6 +7882,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); @@ -7892,11 +7897,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspendWithJvmOverloads.kt"); } - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt"); diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index 8e86f9b0306..e222af1a2c5 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -7036,15 +7036,15 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java index b0bda9bd3fd..35c9546398d 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java @@ -7132,15 +7132,15 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java index de99502bbdc..0dd390f35d2 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java @@ -7132,15 +7132,15 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java index d8f4958dbbe..290daa4e9c4 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java @@ -7132,15 +7132,15 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java index c003cff3fa3..004b35d621f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java @@ -8145,15 +8145,15 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java index 4d62aa7c5ab..4b3a143f64f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java @@ -8321,15 +8321,15 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java index 527d92f6b99..afa83e81b5a 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java @@ -7971,15 +7971,15 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java index bcc49eee43b..4380bf4fe9a 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java @@ -8059,15 +8059,15 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT } @Test - @TestMetadata("defaultParametersInSuspend.kt") - public void testDefaultParametersInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); } @Test - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); + @TestMetadata("defaultParametersInSuspend.kt") + public void testDefaultParametersInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } @Test diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java index 0e20ac9c456..237ce51f6e4 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java @@ -6277,16 +6277,16 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/coroutines/crossInlineWithCapturedOuterReceiver.kt"); } + @TestMetadata("defaultParameterLambdaInSuspend.kt") + public void testDefaultParameterLambdaInSuspend() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/defaultParameterLambdaInSuspend.kt"); + } + @TestMetadata("defaultParametersInSuspend.kt") public void testDefaultParametersInSuspend() throws Exception { runTest("compiler/testData/codegen/box/coroutines/defaultParametersInSuspend.kt"); } - @TestMetadata("defaultParamterLambdaInSuspend.kt") - public void testDefaultParamterLambdaInSuspend() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/defaultParamterLambdaInSuspend.kt"); - } - @TestMetadata("delegatedSuspendMember.kt") public void testDelegatedSuspendMember() throws Exception { runTest("compiler/testData/codegen/box/coroutines/delegatedSuspendMember.kt");