From 22e0262e8a4b31cea52d03adc9d498301ef0c9fb Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Fri, 28 Mar 2025 20:08:50 +0800 Subject: [PATCH 1/2] JVM: use real override as super bridge target We don't generate bridges for Java classes, for a case like KT-72039, even though there is a real override `keySet()LKeySetView;` in `ConcurrentHashMap`, our Kotlin class `Test1` always sees it as a fake override by using `overriddenFromClass`, just because `ConcurrentHashMap` is not the direct super type of `Test1`. #KT-72039 Fixed --- .../based/LLBlackBoxTestGenerated.java | 6 ++++++ .../based/LLReversedBlackBoxTestGenerated.java | 6 ++++++ ...rLightTreeBlackBoxCodegenTestGenerated.java | 6 ++++++ .../FirPsiBlackBoxCodegenTestGenerated.java | 6 ++++++ .../kotlin/backend/jvm/lower/BridgeLowering.kt | 5 +---- .../codegen/box/collections/kt72039.kt | 18 ++++++++++++++++++ .../JvmAbiConsistencyTestBoxGenerated.java | 6 ++++++ .../IrBlackBoxCodegenTestGenerated.java | 6 ++++++ ...oxCodegenTestWithInlineScopesGenerated.java | 6 ++++++ .../test/fir/FirJsCodegenBoxTestGenerated.java | 6 ++++++ ...enBoxWithInlinedFunInKlibTestGenerated.java | 6 ++++++ .../fir/FirJsES6CodegenBoxTestGenerated.java | 6 ++++++ .../test/ir/IrJsCodegenBoxTestGenerated.java | 6 ++++++ .../ir/IrJsES6CodegenBoxTestGenerated.java | 6 ++++++ ...DeserializationCodegenBoxTestGenerated.java | 6 ++++++ ...enBoxWithInlinedFunInKlibTestGenerated.java | 6 ++++++ .../FirNativeCodegenBoxTestGenerated.java | 6 ++++++ .../FirNativeCodegenBoxTestNoPLGenerated.java | 6 ++++++ .../NativeCodegenBoxTestGenerated.java | 6 ++++++ .../NativeCodegenBoxTestNoPLGenerated.java | 6 ++++++ ...enBoxWithInlinedFunInKlibTestGenerated.java | 6 ++++++ .../NativeIrDeserializationTestGenerated.java | 6 ++++++ ...ationWithInlinedFunInKlibTestGenerated.java | 6 ++++++ .../test/FirWasmJsCodegenBoxTestGenerated.java | 6 ++++++ ...enBoxWithInlinedFunInKlibTestGenerated.java | 6 ++++++ .../test/K1WasmCodegenBoxTestGenerated.java | 6 ++++++ 26 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 compiler/testData/codegen/box/collections/kt72039.kt diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLBlackBoxTestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLBlackBoxTestGenerated.java index dae0ca80487bc..26194dd52c416 100644 --- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLBlackBoxTestGenerated.java +++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLBlackBoxTestGenerated.java @@ -8986,6 +8986,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedBlackBoxTestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedBlackBoxTestGenerated.java index ca4669c78e092..c525d059c83da 100644 --- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedBlackBoxTestGenerated.java +++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedBlackBoxTestGenerated.java @@ -8986,6 +8986,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 640a9a9e1d8f6..e4b9c4eb03daa 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 @@ -8873,6 +8873,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 e995c40497902..89629d9467ee7 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 @@ -8873,6 +8873,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index 652468b59f1b5..de8ccc48a5e11 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -227,10 +227,7 @@ internal class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPas isFinal = false, ) - // The part after '?:' is needed for methods with default implementations in collection interfaces: - // MutableMap.remove() and getOrDefault(). - val superTarget = overriddenFromClass.takeIf { !it.isFakeOverride || !specialBridge.isOverriding } - ?: specialBridge.overridden + val superTarget = targetFunction if (superBridge.signature == superTarget.jvmMethod) { // If the resulting bridge to a super member matches the signature of the bridge callee, diff --git a/compiler/testData/codegen/box/collections/kt72039.kt b/compiler/testData/codegen/box/collections/kt72039.kt new file mode 100644 index 0000000000000..b955be46261fc --- /dev/null +++ b/compiler/testData/codegen/box/collections/kt72039.kt @@ -0,0 +1,18 @@ +// FULL_JDK + +// FILE: kt72039.kt +fun box():String { + Test1().test() + return "OK" +} + +class Test1 : Test0() + +// FILE: Test0.java +import java.util.concurrent.ConcurrentHashMap; + +public class Test0 extends ConcurrentHashMap { + public void test() { + new Test1().keySet(); + } +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index a40d82b654a75..2da9293569bc6 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -8873,6 +8873,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 bf89ba2f53f8d..65966b980356f 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 @@ -8873,6 +8873,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java index e06c497c84ffc..edd97b1dc0e64 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java @@ -8873,6 +8873,12 @@ public void testKt65555() { runTest("compiler/testData/codegen/box/collections/kt65555.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("mutableList.kt") public void testMutableList() { 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 9f9e51c472144..139ae29ce522c 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 @@ -6755,6 +6755,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java index 4920c87f52185..da2e3e2f99c86 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6757,6 +6757,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java index 0ac04d25ef4f1..64cf08017e975 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java @@ -6818,6 +6818,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 88eeba2968381..0693b23eaa001 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 @@ -6818,6 +6818,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 9909e262d7551..c1ef9ddd5db0f 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 @@ -6880,6 +6880,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java index 38d1763258540..2e4966dd751db 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java @@ -6757,6 +6757,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java index 8c1707919cae4..a349a8b8dcc7f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6757,6 +6757,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java index 578a1fcc8a02d..793c7b1a5726b 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java @@ -6907,6 +6907,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java index aa8117f525db5..5886183541088 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java @@ -7035,6 +7035,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java index 3a443679cd68e..4136869d19597 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java @@ -6971,6 +6971,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java index 4d185f651fa51..70895248a4a22 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java @@ -7099,6 +7099,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java index 348e6197506ea..ef8f73588c09a 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6907,6 +6907,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java index dcb206d4382f4..d16b41be18b1c 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java @@ -6769,6 +6769,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java index f26b5914eb5fc..c9d3cc2260893 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java @@ -6769,6 +6769,12 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java index c926eff1a909b..1913a3ffca3c1 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java @@ -6749,6 +6749,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java index 755f6b6b6b1a1..7dfd03c7cb311 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6749,6 +6749,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 236c76fd22528..7047cf6c4c03b 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 @@ -6749,6 +6749,12 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } + @Test + @TestMetadata("kt72039.kt") + public void testKt72039() { + runTest("compiler/testData/codegen/box/collections/kt72039.kt"); + } + @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { From 5b99eeabfcd703a98dd405d59c82a36eeb98fa6d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 31 Jul 2025 12:37:58 +0200 Subject: [PATCH 2/2] fixup! JVM: use real override as super bridge target --- .../jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt | 6 ++---- compiler/testData/codegen/box/collections/kt72039.kt | 4 ++-- .../kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java | 6 ------ .../FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java | 6 ------ .../kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java | 6 ------ .../kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java | 6 ------ .../kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java | 6 ------ .../test/ir/JsIrDeserializationCodegenBoxTestGenerated.java | 6 ------ ...lizationCodegenBoxWithInlinedFunInKlibTestGenerated.java | 6 ------ .../test/blackbox/FirNativeCodegenBoxTestGenerated.java | 6 ------ .../test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java | 6 ------ .../konan/test/blackbox/NativeCodegenBoxTestGenerated.java | 6 ------ .../test/blackbox/NativeCodegenBoxTestNoPLGenerated.java | 6 ------ .../NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java | 6 ------ .../serialization/NativeIrDeserializationTestGenerated.java | 6 ------ ...eIrDeserializationWithInlinedFunInKlibTestGenerated.java | 6 ------ .../kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java | 6 ------ ...irWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java | 6 ------ .../kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java | 6 ------ 19 files changed, 4 insertions(+), 108 deletions(-) diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt index de8ccc48a5e11..fb7bee4b9fafe 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt @@ -227,15 +227,13 @@ internal class BridgeLowering(val context: JvmBackendContext) : ClassLoweringPas isFinal = false, ) - val superTarget = targetFunction - - if (superBridge.signature == superTarget.jvmMethod) { + if (superBridge.signature == targetFunction.jvmMethod) { // If the resulting bridge to a super member matches the signature of the bridge callee, // bridge is not needed. irFunction } else { irClass.declarations.remove(irFunction) - irClass.addSpecialBridge(superBridge, superTarget) + irClass.addSpecialBridge(superBridge, targetFunction) } } diff --git a/compiler/testData/codegen/box/collections/kt72039.kt b/compiler/testData/codegen/box/collections/kt72039.kt index b955be46261fc..e2b59c3d7cbcd 100644 --- a/compiler/testData/codegen/box/collections/kt72039.kt +++ b/compiler/testData/codegen/box/collections/kt72039.kt @@ -1,7 +1,7 @@ +// TARGET_BACKEND: JVM // FULL_JDK - // FILE: kt72039.kt -fun box():String { +fun box(): String { Test1().test() return "OK" } 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 139ae29ce522c..9f9e51c472144 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 @@ -6755,12 +6755,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java index da2e3e2f99c86..4920c87f52185 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6757,12 +6757,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java index 64cf08017e975..0ac04d25ef4f1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java @@ -6818,12 +6818,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 0693b23eaa001..88eeba2968381 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 @@ -6818,12 +6818,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 c1ef9ddd5db0f..9909e262d7551 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 @@ -6880,12 +6880,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java index 2e4966dd751db..38d1763258540 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxTestGenerated.java @@ -6757,12 +6757,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java index a349a8b8dcc7f..8c1707919cae4 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/JsIrDeserializationCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6757,12 +6757,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java index 793c7b1a5726b..578a1fcc8a02d 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java @@ -6907,12 +6907,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java index 5886183541088..aa8117f525db5 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java @@ -7035,12 +7035,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java index 4136869d19597..3a443679cd68e 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java @@ -6971,12 +6971,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java index 70895248a4a22..4d185f651fa51 100644 --- a/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java +++ b/native/native.tests/codegen-box/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java @@ -7099,12 +7099,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java index ef8f73588c09a..348e6197506ea 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6907,12 +6907,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java index d16b41be18b1c..dcb206d4382f4 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationTestGenerated.java @@ -6769,12 +6769,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java index c9d3cc2260893..f26b5914eb5fc 100644 --- a/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java +++ b/native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/serialization/NativeIrDeserializationWithInlinedFunInKlibTestGenerated.java @@ -6769,12 +6769,6 @@ public void testInternalRemove() { runTest("compiler/testData/codegen/box/collections/internalRemove.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java index 1913a3ffca3c1..c926eff1a909b 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java @@ -6749,12 +6749,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java index 7dfd03c7cb311..755f6b6b6b1a1 100644 --- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java +++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxWithInlinedFunInKlibTestGenerated.java @@ -6749,12 +6749,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() { 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 7047cf6c4c03b..236c76fd22528 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 @@ -6749,12 +6749,6 @@ public void testKt41123() { runTest("compiler/testData/codegen/box/collections/kt41123.kt"); } - @Test - @TestMetadata("kt72039.kt") - public void testKt72039() { - runTest("compiler/testData/codegen/box/collections/kt72039.kt"); - } - @Test @TestMetadata("removeClash.kt") public void testRemoveClash() {