diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index 10428c2f8aa..a9299638077 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -501,7 +501,7 @@ default: `indy-with-constants` for JVM target 9 or greater, `inline` otherwise"" result[JvmAnalysisFlags.enableJvmPreview] = enableJvmPreview result[AnalysisFlags.allowUnstableDependencies] = allowUnstableDependencies || useFir result[JvmAnalysisFlags.disableUltraLightClasses] = disableUltraLightClasses - result[JvmAnalysisFlags.useIR] = useIR + result[JvmAnalysisFlags.useIR] = !useOldBackend return result } diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args new file mode 100644 index 00000000000..ce9cc3c58b8 --- /dev/null +++ b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args @@ -0,0 +1,3 @@ +$TESTDATA_DIR$/suspendInFunInterfaceDefault.kt +-d +$TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt new file mode 100644 index 00000000000..dc7eb99909e --- /dev/null +++ b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.kt @@ -0,0 +1,3 @@ +fun interface FIC { + suspend fun foo() +} diff --git a/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out new file mode 100644 index 00000000000..d86bac9de59 --- /dev/null +++ b/compiler/testData/cli/jvm/suspendInFunInterfaceDefault.out @@ -0,0 +1 @@ +OK diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index 213ba176c0d..a2d5ccf9d49 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -771,6 +771,11 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/suppressAllWarningsJvm.args"); } + @TestMetadata("suspendInFunInterfaceDefault.args") + public void testSuspendInFunInterfaceDefault() throws Exception { + runTest("compiler/testData/cli/jvm/suspendInFunInterfaceDefault.args"); + } + @TestMetadata("suspendInFunInterfaceIrDisabled.args") public void testSuspendInFunInterfaceIrDisabled() throws Exception { runTest("compiler/testData/cli/jvm/suspendInFunInterfaceIrDisabled.args"); diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 5dcf7977240..66c7c4e8f89 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -8125,11 +8125,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Resume extends AbstractLightAnalysisModeTest { - @TestMetadata("boxTypeParameterOfSuperTypeResult.kt") - public void ignoreBoxTypeParameterOfSuperTypeResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxTypeParameterOfSuperTypeResult.kt"); - } - private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } @@ -8153,6 +8148,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxTypeParameterOfSuperType.kt"); } + @TestMetadata("boxTypeParameterOfSuperTypeResult.kt") + public void testBoxTypeParameterOfSuperTypeResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxTypeParameterOfSuperTypeResult.kt"); + } + @TestMetadata("boxUnboxInsideCoroutine.kt") public void testBoxUnboxInsideCoroutine() throws Exception { runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resume/boxUnboxInsideCoroutine.kt"); @@ -8363,11 +8363,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class ResumeWithException extends AbstractLightAnalysisModeTest { - @TestMetadata("boxTypeParameterOfSuperTypeResult.kt") - public void ignoreBoxTypeParameterOfSuperTypeResult() throws Exception { - runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxTypeParameterOfSuperTypeResult.kt"); - } - private void runTest(String testDataFilePath) throws Exception { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath); } @@ -8391,6 +8386,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxTypeParameterOfSuperType.kt"); } + @TestMetadata("boxTypeParameterOfSuperTypeResult.kt") + public void testBoxTypeParameterOfSuperTypeResult() throws Exception { + runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxTypeParameterOfSuperTypeResult.kt"); + } + @TestMetadata("boxUnboxInsideCoroutine.kt") public void testBoxUnboxInsideCoroutine() throws Exception { runTest("compiler/testData/codegen/box/coroutines/inlineClasses/resumeWithException/boxUnboxInsideCoroutine.kt");