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 46f0c29776b..f570781bf3a 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 @@ -49004,6 +49004,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @Test + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @Test @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() 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 5d2677b2dc7..71567a721c7 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 @@ -49004,6 +49004,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @Test + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @Test @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() throws Exception { diff --git a/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt index 21da8bdd3b9..7d0b6489bdb 100644 --- a/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt +++ b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt @@ -1,9 +1,5 @@ -// IGNORE_BACKEND: WASM -// WASM_MUTE_REASON: IGNORED_IN_JS -// IGNORE_BACKEND: JS_IR -// IGNORE_BACKEND: JS_IR_ES6 -// TODO: muted automatically, investigate should it be ran for JS or not -// IGNORE_BACKEND: JS, NATIVE +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // SAM_CONVERSIONS: CLASS fun box(): String { diff --git a/compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt new file mode 100644 index 00000000000..6a55f06d5ea --- /dev/null +++ b/compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt @@ -0,0 +1,13 @@ +// SAM_CONVERSIONS: CLASS + +fun interface SAM { + fun run() +} + +fun box(): String { + val f = { } + val class1 = (SAM(f) as Any)::class + val class2 = (SAM(f) as Any)::class + + return if (class1 == class2) "OK" else "$class1 $class2" +} diff --git a/compiler/testData/codegen/box/sam/kt17765.kt b/compiler/testData/codegen/box/sam/kt17765.kt index e4feb376a11..51c4f453636 100644 --- a/compiler/testData/codegen/box/sam/kt17765.kt +++ b/compiler/testData/codegen/box/sam/kt17765.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: JS, NATIVE, WASM, JS_IR, JS_IR_ES6 +// TARGET_BACKEND: JVM +// TARGET_BACKEND: JVM_IR // !LANGUAGE: +EliminateAmbiguitiesOnInheritedSamInterfaces // FILE: Test.java diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt index d771c297f82..b42190cbc11 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt index 8b05730fdfc..11a1945d35a 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt index 834c1b4ea21..eae795e6c19 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt index 92db795d172..08fa925e873 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt index 284f724f26d..90b8f9fb04b 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt index ed00d6d7de1..b7b751085b3 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: static cache is broken: ld.gold invocation reported errors. Please try to disable compiler caches and rerun the build. +// DONT_TARGET_EXACT_BACKEND: NATIVE // IGNORE_BACKEND: JS_IR, JS_IR_ES6 // MODULE: lib // FILE: 2.kt diff --git a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt index bcfb69b0ece..4a2b51c741e 100644 --- a/compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt +++ b/compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt @@ -1,5 +1,8 @@ -// IGNORE_BACKEND: NATIVE +// DONT_TARGET_EXACT_BACKEND: NATIVE +// NATIVE error: error: compilation failed: IrClassPublicSymbolImpl for box.sameFileInSourceAndDependencies.nestedClassDeclaration/Host|null[0] is already bound: CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any] // IGNORE_BACKEND: JS_IR, JS_IR_ES6 +// JS_IR error: IrClassPublicSymbolImpl for /Host|null[0] is already bound: CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any] + // MODULE: lib // FILE: 2.kt class Host { 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 b1f06f07f02..49f303e8307 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 @@ -46256,6 +46256,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @Test + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @Test @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() 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 27cbec982f9..060e4caaefd 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 @@ -49004,6 +49004,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @Test + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @Test @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() 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 a1f8a6fc76e..e351fe8c3de 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 @@ -49004,6 +49004,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @Test + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @Test @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() 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 0c5dca4069b..c5a7a4bec9d 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -39263,6 +39263,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); } + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); + } + @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() throws Exception { runTest("compiler/testData/codegen/box/sam/constructors/syntheticVsReal.kt"); 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 92fc48a885a..e0084754732 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 @@ -33851,12 +33851,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -33945,9 +33939,9 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } 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 85393eb9b3c..99ebe61c35a 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 @@ -33851,12 +33851,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -33945,9 +33939,9 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } 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 cd857a22d65..4f93a95b6b6 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 @@ -33851,12 +33851,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -33945,9 +33939,9 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } 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 216a9ba87a9..72321fa2f5f 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 @@ -37295,12 +37295,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -37401,9 +37395,9 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } @@ -37446,54 +37440,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sameFileInSourceAndDependencies"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("classDeclaration.kt") - public void testClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt"); - } - @Test @TestMetadata("differingNumberOfGenericTypeParameters.kt") public void testDifferingNumberOfGenericTypeParameters() throws Exception { runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt"); } - @Test - @TestMetadata("functionDeclaration.kt") - public void testFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt"); - } - - @Test - @TestMetadata("lateinitMemberPropertyDeclaration.kt") - public void testLateinitMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionDeclaration.kt") - public void testMemberFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionWithDefaultArgumentsDeclaration.kt") - public void testMemberFunctionWithDefaultArgumentsDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt"); - } - - @Test - @TestMetadata("memberPropertyDeclaration.kt") - public void testMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("nestedClassDeclaration.kt") - public void testNestedClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt"); - } - @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { 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 85fa373fdf3..d1879aec5dc 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 @@ -38237,12 +38237,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -38351,9 +38345,9 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } @@ -38402,54 +38396,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sameFileInSourceAndDependencies"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("classDeclaration.kt") - public void testClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt"); - } - @Test @TestMetadata("differingNumberOfGenericTypeParameters.kt") public void testDifferingNumberOfGenericTypeParameters() throws Exception { runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt"); } - @Test - @TestMetadata("functionDeclaration.kt") - public void testFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt"); - } - - @Test - @TestMetadata("lateinitMemberPropertyDeclaration.kt") - public void testLateinitMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionDeclaration.kt") - public void testMemberFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionWithDefaultArgumentsDeclaration.kt") - public void testMemberFunctionWithDefaultArgumentsDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt"); - } - - @Test - @TestMetadata("memberPropertyDeclaration.kt") - public void testMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("nestedClassDeclaration.kt") - public void testNestedClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt"); - } - @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { 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 926dd347365..e4cabe6ebf8 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 @@ -36825,12 +36825,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -36927,9 +36921,9 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } @@ -36969,54 +36963,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sameFileInSourceAndDependencies"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("classDeclaration.kt") - public void testClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt"); - } - @Test @TestMetadata("differingNumberOfGenericTypeParameters.kt") public void testDifferingNumberOfGenericTypeParameters() throws Exception { runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt"); } - @Test - @TestMetadata("functionDeclaration.kt") - public void testFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt"); - } - - @Test - @TestMetadata("lateinitMemberPropertyDeclaration.kt") - public void testLateinitMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionDeclaration.kt") - public void testMemberFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionWithDefaultArgumentsDeclaration.kt") - public void testMemberFunctionWithDefaultArgumentsDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt"); - } - - @Test - @TestMetadata("memberPropertyDeclaration.kt") - public void testMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("nestedClassDeclaration.kt") - public void testNestedClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt"); - } - @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { 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 da931420513..a0d512b4e20 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 @@ -37296,12 +37296,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @Test @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { @@ -37402,9 +37396,9 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT } @Test - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } } @@ -37447,54 +37441,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sameFileInSourceAndDependencies"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true); } - @Test - @TestMetadata("classDeclaration.kt") - public void testClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/classDeclaration.kt"); - } - @Test @TestMetadata("differingNumberOfGenericTypeParameters.kt") public void testDifferingNumberOfGenericTypeParameters() throws Exception { runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/differingNumberOfGenericTypeParameters.kt"); } - @Test - @TestMetadata("functionDeclaration.kt") - public void testFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/functionDeclaration.kt"); - } - - @Test - @TestMetadata("lateinitMemberPropertyDeclaration.kt") - public void testLateinitMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/lateinitMemberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionDeclaration.kt") - public void testMemberFunctionDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionDeclaration.kt"); - } - - @Test - @TestMetadata("memberFunctionWithDefaultArgumentsDeclaration.kt") - public void testMemberFunctionWithDefaultArgumentsDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberFunctionWithDefaultArgumentsDeclaration.kt"); - } - - @Test - @TestMetadata("memberPropertyDeclaration.kt") - public void testMemberPropertyDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/memberPropertyDeclaration.kt"); - } - - @Test - @TestMetadata("nestedClassDeclaration.kt") - public void testNestedClassDeclaration() throws Exception { - runTest("compiler/testData/codegen/box/sameFileInSourceAndDependencies/nestedClassDeclaration.kt"); - } - @Test @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { 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 af17d0d8270..2920ec94a9a 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 @@ -30209,11 +30209,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/sam"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true); } - @TestMetadata("kt17765.kt") - public void testKt17765() throws Exception { - runTest("compiler/testData/codegen/box/sam/kt17765.kt"); - } - @TestMetadata("kt51821.kt") public void testKt51821() throws Exception { runTest("compiler/testData/codegen/box/sam/kt51821.kt"); @@ -30305,9 +30300,9 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest runTest("compiler/testData/codegen/box/sam/constructors/nonLiteralComparator.kt"); } - @TestMetadata("sameWrapperClass.kt") - public void testSameWrapperClass() throws Exception { - runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass.kt"); + @TestMetadata("sameWrapperClass2.kt") + public void testSameWrapperClass2() throws Exception { + runTest("compiler/testData/codegen/box/sam/constructors/sameWrapperClass2.kt"); } }