JVM_IR KT-46408 properly map fake overrides in method handles

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/MethodSignatureMapper.kt

@@ -438,7 +438,7 @@ class MethodSignatureMapper(private val context: JvmBackendContext) {
         mapAsmMethod(findSuperDeclaration(function, isSuperCall))
 
     // Copied from KotlinTypeMapper.findSuperDeclaration.
-    private fun findSuperDeclaration(function: IrSimpleFunction, isSuperCall: Boolean): IrSimpleFunction {
+    internal fun findSuperDeclaration(function: IrSimpleFunction, isSuperCall: Boolean): IrSimpleFunction {
         var current = function
         while (current.isFakeOverride) {
             // TODO: probably isJvmInterface instead of isInterface, here and in KotlinTypeMapper

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/JvmInvokeDynamic.kt

@@ -101,11 +101,24 @@ object JvmInvokeDynamic : IntrinsicMethod() {
         }
 
     private fun generateMethodHandle(irRawFunctionReference: IrRawFunctionReference, codegen: ExpressionCodegen): Handle {
-        val irFun = irRawFunctionReference.symbol.owner
+        val irFun = when (val irFun0 = irRawFunctionReference.symbol.owner) {
+            is IrConstructor ->
+                irFun0
+            is IrSimpleFunction -> {
+                // Note that if the given function is a fake override, we emit a method handle with explicit super class.
+                // This has the same binary compatibility guarantees as in Java.
+                codegen.methodSignatureMapper.findSuperDeclaration(irFun0, false)
+            }
+            else ->
+                throw java.lang.AssertionError("Simple function or constructor expected: ${irFun0.render()}")
+        }
+
         val irParentClass = irFun.parent as? IrClass
             ?: throw AssertionError("Unexpected parent: ${irFun.parent.render()}")
         val owner = codegen.typeMapper.mapOwner(irParentClass)
+
         val asmMethod = codegen.methodSignatureMapper.mapAsmMethod(irFun)
+
         val handleTag = when {
             irFun is IrConstructor ->
                 Opcodes.H_NEWINVOKESPECIAL
@@ -116,6 +129,7 @@ object JvmInvokeDynamic : IntrinsicMethod() {
             else ->
                 Opcodes.H_INVOKEVIRTUAL
         }
+
         return Handle(handleTag, owner.internalName, asmMethod.name, asmMethod.descriptor, irParentClass.isJvmInterface)
     }