Bridge: Use real override as super bridge target

compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/BridgeLowering.kt

@@ -227,18 +227,13 @@ 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
-
-                            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)
                             }
                         }
 

compiler/testData/codegen/box/collections/kt72039.kt

@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// 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<String, String> {
+    public void test() {
+        new Test1().keySet();
+    }
+}