From 09a0905ffccc91d0848b74c87e1fb9c79a6be716 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Mon, 26 Jun 2023 07:44:12 +0000 Subject: [PATCH] [Test] Convert IGNORE: NATIVE directives in rest of tests ^KT-59057 Fixed Merge-request: KT-MR-10794 Merged-by: Vladimir Sukharev --- .../clashingFakeOverrideSignatures.kt | 1 + ...vateCompanionObjectValInDifferentModule.kt | 3 +- .../privateTopLevelValInDifferentModule.kt | 3 +- .../specialBridgesInDependencies.kt | 3 +- .../unsignedTypesInAnnotations.kt | 2 +- .../box/enum/enumEntriesNameClashes.kt | 1 + .../defaultArguments/dispatchReceiverValue.kt | 4 +-- .../defaultArguments/superCall.kt | 1 + .../k2/defaultArguments/superCall.kt | 1 + .../primitiveTypes/substituteIntForGeneric.kt | 5 +--- .../fir/FirJsCodegenBoxTestGenerated.java | 6 ++++ .../test/ir/IrJsCodegenBoxTestGenerated.java | 6 ++++ .../ir/IrJsES6CodegenBoxTestGenerated.java | 6 ++++ .../FirNativeCodegenBoxTestGenerated.java | 30 ++++--------------- .../FirNativeCodegenBoxTestNoPLGenerated.java | 30 ++++--------------- .../NativeCodegenBoxTestGenerated.java | 30 ++++--------------- .../NativeCodegenBoxTestNoPLGenerated.java | 30 ++++--------------- .../test/FirWasmCodegenBoxTestGenerated.java | 6 ++++ .../test/K1WasmCodegenBoxTestGenerated.java | 6 ++++ 19 files changed, 68 insertions(+), 106 deletions(-) diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt index 0ef4d3c8b5a..5f97608588d 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt @@ -1,4 +1,5 @@ // IGNORE_BACKEND_K2: JVM_IR, JS_IR +// KT-59609 // IGNORE_BACKEND: NATIVE // FIR status: Validation failed. TODO decide if we want to fix KT-42020 for FIR as well // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt index d072ac712a0..63d06e45e53 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt @@ -1,5 +1,6 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JS_IR, JS, NATIVE +// DONT_TARGET_EXACT_BACKEND: NATIVE +// IGNORE_BACKEND: JS_IR, JS // WITH_REFLECT // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt index be5ef9a2dc1..92ab5e70141 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt @@ -1,5 +1,6 @@ // !LANGUAGE: +InlineClasses -// IGNORE_BACKEND: JS_IR, JS, NATIVE +// DONT_TARGET_EXACT_BACKEND: NATIVE +// IGNORE_BACKEND: JS_IR, JS // WITH_REFLECT // MODULE: lib diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt index 7987f75a05e..0a9d4ebc903 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt @@ -1,4 +1,5 @@ -// IGNORE_BACKEND: NATIVE +// NATIVE error: this type is final, so it cannot be inherited from +// DONT_TARGET_EXACT_BACKEND: NATIVE // WITH_STDLIB // MODULE: lib // FILE: A.kt diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt index 0c6934db3ac..42541bd7c6e 100644 --- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt +++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: NATIVE +// DONT_TARGET_EXACT_BACKEND: NATIVE // WITH_STDLIB // WITH_REFLECT diff --git a/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt b/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt index 2019e43d9ab..262f7c785c8 100644 --- a/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt +++ b/compiler/testData/codegen/box/enum/enumEntriesNameClashes.kt @@ -1,4 +1,5 @@ // !LANGUAGE: +EnumEntries +// KT-59611 // IGNORE_BACKEND_K2: JVM_IR, JS_IR, NATIVE, WASM // IGNORE_BACKEND: JS, JVM // WITH_STDLIB diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt index 7b28e025619..53ba0f724a5 100644 --- a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt +++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt @@ -1,6 +1,6 @@ -// IGNORE_BACKEND: WASM, JS_IR, JS_IR_ES6, NATIVE +// IGNORE_BACKEND: WASM, JS_IR, JS_IR_ES6 // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS -// IGNORE_BACKEND_K2: JVM, JVM_IR +// IGNORE_BACKEND_K2: JVM, JVM_IR, NATIVE // FIR status: outdated code (expect and actual in the same module) // !LANGUAGE: +MultiPlatformProjects diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt index 1c11ba7cdba..43b03627718 100644 --- a/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt +++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt @@ -1,6 +1,7 @@ // IGNORE_BACKEND: WASM // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS // !LANGUAGE: +MultiPlatformProjects +// K1/NATIVE fail: KT-59608 // IGNORE_BACKEND: NATIVE // IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JVM diff --git a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt index 7942c65d802..5a1a3161832 100644 --- a/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt +++ b/compiler/testData/codegen/box/multiplatform/k2/defaultArguments/superCall.kt @@ -1,6 +1,7 @@ // IGNORE_BACKEND: WASM // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS // !LANGUAGE: +MultiPlatformProjects +// K2/NATIVE fail: KT-59608 // IGNORE_BACKEND: NATIVE, JVM, JVM_IR // IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6 diff --git a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt index dd9de3bab35..b9f77159d21 100644 --- a/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt +++ b/compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt @@ -1,11 +1,8 @@ -// TARGET_BACKEND: JVM -// TARGET_BACKEND: JVM_IR - class L(var a: T) {} fun foo() = L(5).a fun box(): String { val x: Any = foo() - return if (x is Integer) "OK" else "Fail $x" + return if (x is Int) "OK" else "Fail $x" } 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 e74962089f0..8c902dfdf9d 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 @@ -25385,6 +25385,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest { runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { 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 0c0e90fd847..cd341ab4386 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 @@ -25385,6 +25385,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { 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 9e2aa073c17..902a2e25678 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 @@ -25385,6 +25385,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { 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 52457d8e853..921e5894a32 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 @@ -5713,12 +5713,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt"); } - @Test - @TestMetadata("specialBridgesInDependencies.kt") - public void testSpecialBridgesInDependencies() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt"); - } - @Test @TestMetadata("starImportEnum.kt") public void testStarImportEnum() throws Exception { @@ -5731,12 +5725,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt"); } - @Test - @TestMetadata("unsignedTypesInAnnotations.kt") - public void testUnsignedTypesInAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); - } - @Test @TestMetadata("useDeserializedFunInterface.kt") public void testUseDeserializedFunInterface() throws Exception { @@ -5828,12 +5816,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/internalWithInlineClass.kt"); } - @Test - @TestMetadata("privateCompanionObjectValInDifferentModule.kt") - public void testPrivateCompanionObjectValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt"); - } - @Test @TestMetadata("privateConstructor.kt") public void testPrivateConstructor() throws Exception { @@ -5852,12 +5834,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateConstructorWithPrivateFieldUsingTypeTable.kt"); } - @Test - @TestMetadata("privateTopLevelValInDifferentModule.kt") - public void testPrivateTopLevelValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt"); - } - @Test @TestMetadata("suspendFunWithDefaultMangling.kt") public void testSuspendFunWithDefaultMangling() throws Exception { @@ -28426,6 +28402,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() 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 6e36d26e116..3f19e089ddf 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 @@ -5833,12 +5833,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt"); } - @Test - @TestMetadata("specialBridgesInDependencies.kt") - public void testSpecialBridgesInDependencies() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt"); - } - @Test @TestMetadata("starImportEnum.kt") public void testStarImportEnum() throws Exception { @@ -5851,12 +5845,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt"); } - @Test - @TestMetadata("unsignedTypesInAnnotations.kt") - public void testUnsignedTypesInAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); - } - @Test @TestMetadata("useDeserializedFunInterface.kt") public void testUseDeserializedFunInterface() throws Exception { @@ -5952,12 +5940,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/internalWithInlineClass.kt"); } - @Test - @TestMetadata("privateCompanionObjectValInDifferentModule.kt") - public void testPrivateCompanionObjectValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt"); - } - @Test @TestMetadata("privateConstructor.kt") public void testPrivateConstructor() throws Exception { @@ -5976,12 +5958,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateConstructorWithPrivateFieldUsingTypeTable.kt"); } - @Test - @TestMetadata("privateTopLevelValInDifferentModule.kt") - public void testPrivateTopLevelValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt"); - } - @Test @TestMetadata("suspendFunWithDefaultMangling.kt") public void testSuspendFunWithDefaultMangling() throws Exception { @@ -29074,6 +29050,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() 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 10dc8bb13d8..6346968f4a5 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 @@ -5654,12 +5654,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt"); } - @Test - @TestMetadata("specialBridgesInDependencies.kt") - public void testSpecialBridgesInDependencies() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt"); - } - @Test @TestMetadata("starImportEnum.kt") public void testStarImportEnum() throws Exception { @@ -5672,12 +5666,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt"); } - @Test - @TestMetadata("unsignedTypesInAnnotations.kt") - public void testUnsignedTypesInAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); - } - @Test @TestMetadata("useDeserializedFunInterface.kt") public void testUseDeserializedFunInterface() throws Exception { @@ -5767,12 +5755,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/internalWithInlineClass.kt"); } - @Test - @TestMetadata("privateCompanionObjectValInDifferentModule.kt") - public void testPrivateCompanionObjectValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt"); - } - @Test @TestMetadata("privateConstructor.kt") public void testPrivateConstructor() throws Exception { @@ -5791,12 +5773,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateConstructorWithPrivateFieldUsingTypeTable.kt"); } - @Test - @TestMetadata("privateTopLevelValInDifferentModule.kt") - public void testPrivateTopLevelValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt"); - } - @Test @TestMetadata("suspendFunWithDefaultMangling.kt") public void testSuspendFunWithDefaultMangling() throws Exception { @@ -28103,6 +28079,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() 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 21f6188b641..151391e0f70 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 @@ -5714,12 +5714,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt"); } - @Test - @TestMetadata("specialBridgesInDependencies.kt") - public void testSpecialBridgesInDependencies() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt"); - } - @Test @TestMetadata("starImportEnum.kt") public void testStarImportEnum() throws Exception { @@ -5732,12 +5726,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt"); } - @Test - @TestMetadata("unsignedTypesInAnnotations.kt") - public void testUnsignedTypesInAnnotations() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt"); - } - @Test @TestMetadata("useDeserializedFunInterface.kt") public void testUseDeserializedFunInterface() throws Exception { @@ -5829,12 +5817,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/internalWithInlineClass.kt"); } - @Test - @TestMetadata("privateCompanionObjectValInDifferentModule.kt") - public void testPrivateCompanionObjectValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateCompanionObjectValInDifferentModule.kt"); - } - @Test @TestMetadata("privateConstructor.kt") public void testPrivateConstructor() throws Exception { @@ -5853,12 +5835,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateConstructorWithPrivateFieldUsingTypeTable.kt"); } - @Test - @TestMetadata("privateTopLevelValInDifferentModule.kt") - public void testPrivateTopLevelValInDifferentModule() throws Exception { - runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClasses/privateTopLevelValInDifferentModule.kt"); - } - @Test @TestMetadata("suspendFunWithDefaultMangling.kt") public void testSuspendFunWithDefaultMangling() throws Exception { @@ -28427,6 +28403,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java index 35b48ce1394..3826e2f836c 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java @@ -25223,6 +25223,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java index 5f90fecea3b..cf65d1fdc34 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java @@ -25223,6 +25223,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest runTest("compiler/testData/codegen/box/primitiveTypes/stringEqualsHashCodeToString.kt"); } + @Test + @TestMetadata("substituteIntForGeneric.kt") + public void testSubstituteIntForGeneric() throws Exception { + runTest("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + } + @Test @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception {