JVM_IR Do not generate generic signatures for lifted lambda methods

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java

@@ -19945,6 +19945,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/invokedynamic/lambdas/extensionLambda.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("lambdaSerializable.kt")
             public void testLambdaSerializable() throws Exception {
@@ -20127,6 +20133,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
                 runTest("compiler/testData/codegen/box/invokedynamic/sam/genericFunInterfaceWithPrimitive.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("intReturnTypeAsNumber.kt")
             public void testIntReturnTypeAsNumber() throws Exception {

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

@@ -57,17 +57,21 @@ class FunctionCodegen(
     private fun doGenerate(): SMAPAndMethodNode {
         val signature = context.methodSignatureMapper.mapSignatureWithGeneric(irFunction)
         val flags = irFunction.calculateMethodFlags()
+        val isSynthetic = flags.and(Opcodes.ACC_SYNTHETIC) != 0
         val methodNode = MethodNode(
             Opcodes.API_VERSION,
             flags,
             signature.asmMethod.name,
             signature.asmMethod.descriptor,
-            signature.genericsSignature.takeIf { flags.and(Opcodes.ACC_SYNTHETIC) == 0 },
+            signature.genericsSignature
+                .takeIf {
+                    !isSynthetic && irFunction.origin != IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA
+                },
             getThrownExceptions(irFunction)?.toTypedArray()
         )
         val methodVisitor: MethodVisitor = wrapWithMaxLocalCalc(methodNode)
 
-        if (context.state.generateParametersMetadata && flags.and(Opcodes.ACC_SYNTHETIC) == 0) {
+        if (context.state.generateParametersMetadata && !isSynthetic) {
             generateParameterNames(irFunction, methodVisitor, signature, context.state)
         }
 

compiler/testData/codegen/box/inlineClasses/unboxGenericParameter/funInterface/primitive.kt

@@ -2,36 +2,28 @@
 // WASM_MUTE_REASON: SAM_CONVERSIONS
 // !LANGUAGE: +InlineClasses
 
-fun <T> underlying(a: IC): T = bar(a) {
+fun <T1> underlying(a: IC): T1 = bar(a) { it.value as T1 }
-    it.value as T
+
+fun <T2> extension(a: IC): T2 = bar(a) { it.extensionValue() }
+
+fun <T3> dispatch(a: IC): T3 = bar(a) { it.dispatchValue() }
+
+fun <T4> normal(a: IC): T4 = bar(a) { normalValue(it) }
+
+fun interface FunIFace<T0, R> {
+    fun call(ic: T0): R
 }
 
-fun <T> extension(a: IC): T = bar(a) {
+fun <T5, R> bar(value: T5, f: FunIFace<T5, R>): R {
-    it.extensionValue()
-}
-
-fun <T> dispatch(a: IC): T = bar(a) {
-    it.dispatchValue()
-}
-
-fun <T> normal(a: IC): T = bar(a) {
-    normalValue(it)
-}
-
-fun interface FunIFace<T, R> {
-    fun call(ic: T): R
-}
-
-fun <T, R> bar(value: T, f: FunIFace<T, R>): R {
     return f.call(value)
 }
 
-fun <T> IC.extensionValue(): T = value as T
+fun <T6> IC.extensionValue(): T6 = value as T6
 
-fun <T> normalValue(ic: IC): T = ic.value as T
+fun <T7> normalValue(ic: IC): T7 = ic.value as T7
 
 inline class IC(val value: Int) {
-    fun <T> dispatchValue(): T = value as T
+    fun <T8> dispatchValue(): T8 = value as T8
 }
 
 fun box(): String {

compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt

@@ -0,0 +1,14 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+// JVM_TARGET: 1.8
+// LAMBDAS: INDY
+// CHECK_BYTECODE_LISTING
+// WITH_SIGNATURES
+
+fun <T1, R> call(value: T1, f: (T1) -> R): R {
+    return f(value)
+}
+
+fun <T2> test(x: T2) = call(x) { it }
+
+fun box() = test("OK")

compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature_ir.txt

@@ -0,0 +1,8 @@
+@kotlin.Metadata
+public final class<null>  GenericLambdaSignatureKt {
+    // source: 'genericLambdaSignature.kt'
+    public final static <<T1:Ljava/lang/Object;R:Ljava/lang/Object;>(TT1;Lkotlin/jvm/functions/Function1<-TT1;+TR;>;)TR;> method call(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: kotlin.jvm.functions.Function1): java.lang.Object
+    public final static <<T2:Ljava/lang/Object;>(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object
+    public final static @org.jetbrains.annotations.NotNull <null> method box(): java.lang.String
+    private final static <null> method test$lambda-0(p0: java.lang.Object): java.lang.Object
+}

compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature.kt

@@ -0,0 +1,18 @@
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: JVM
+// JVM_TARGET: 1.8
+// SAM_CONVERSIONS: INDY
+// CHECK_BYTECODE_LISTING
+// WITH_SIGNATURES
+
+fun interface FunIFace<T0, R> {
+    fun call(arg: T0): R
+}
+
+fun <T1, R> call(value: T1, f: FunIFace<T1, R>): R {
+    return f.call(value)
+}
+
+fun <T2> test(x: T2) = call(x) { it }
+
+fun box() = test("OK")

compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature_ir.txt

@@ -0,0 +1,14 @@
+@kotlin.Metadata
+public interface<<T0:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object;>  FunIFace {
+    // source: 'genericLambdaSignature.kt'
+    public abstract <(TT0;)TR;> method call(p0: java.lang.Object): java.lang.Object
+}
+
+@kotlin.Metadata
+public final class<null>  GenericLambdaSignatureKt {
+    // source: 'genericLambdaSignature.kt'
+    public final static <<T1:Ljava/lang/Object;R:Ljava/lang/Object;>(TT1;LFunIFace<TT1;TR;>;)TR;> method call(p0: java.lang.Object, @org.jetbrains.annotations.NotNull p1: FunIFace): java.lang.Object
+    public final static <<T2:Ljava/lang/Object;>(TT2;)TT2;> method test(p0: java.lang.Object): java.lang.Object
+    public final static @org.jetbrains.annotations.NotNull <null> method box(): java.lang.String
+    private final static <null> method test$lambda-0(p0: java.lang.Object): java.lang.Object
+}

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java

@@ -19945,6 +19945,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/invokedynamic/lambdas/extensionLambda.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("lambdaSerializable.kt")
             public void testLambdaSerializable() throws Exception {
@@ -20127,6 +20133,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/invokedynamic/sam/genericFunInterfaceWithPrimitive.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("intReturnTypeAsNumber.kt")
             public void testIntReturnTypeAsNumber() throws Exception {

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java

@@ -19945,6 +19945,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/invokedynamic/lambdas/extensionLambda.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("lambdaSerializable.kt")
             public void testLambdaSerializable() throws Exception {
@@ -20127,6 +20133,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/invokedynamic/sam/genericFunInterfaceWithPrimitive.kt");
             }
 
+            @Test
+            @TestMetadata("genericLambdaSignature.kt")
+            public void testGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature.kt");
+            }
+
             @Test
             @TestMetadata("intReturnTypeAsNumber.kt")
             public void testIntReturnTypeAsNumber() throws Exception {

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/BytecodeListingHandler.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.test.backend.handlers
 import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.CHECK_BYTECODE_LISTING
+import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.WITH_SIGNATURES
 import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
 import org.jetbrains.kotlin.test.model.BinaryArtifacts
 import org.jetbrains.kotlin.test.model.TestModule
@@ -27,10 +28,10 @@ class BytecodeListingHandler(testServices: TestServices) : JvmBinaryArtifactHand
         if (CHECK_BYTECODE_LISTING !in module.directives) return
         val dump = BytecodeListingTextCollectingVisitor.getText(
             info.classFileFactory,
-            BytecodeListingTextCollectingVisitor.Filter.ForCodegenTests
+            BytecodeListingTextCollectingVisitor.Filter.ForCodegenTests,
+            withSignatures = WITH_SIGNATURES in module.directives
         )
         multiModuleInfoDumper.builderForModule(module).append(dump)
-
     }
 
     override fun processAfterAllModules(someAssertionWasFailed: Boolean) {

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt

@@ -48,7 +48,12 @@ object CodegenTestDirectives : SimpleDirectivesContainer() {
     )
 
     val CHECK_BYTECODE_LISTING by directive(
-        description = "Dump resulting bytecode to .txt or _ir.txt file",
+        description = "Dump generated classes to .txt or _ir.txt file",
+        applicability = Global
+    )
+
+    val WITH_SIGNATURES by directive(
+        description = "Include generic signatures in generated classes dump",
         applicability = Global
     )
 

compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -16652,6 +16652,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/invokedynamic/lambdas/bigArityExtLambda.kt");
             }
 
+            @TestMetadata("genericLambdaSignature.kt")
+            public void ignoreGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/lambdas/genericLambdaSignature.kt");
+            }
+
             @TestMetadata("lambdaSerializable.kt")
             public void ignoreLambdaSerializable() throws Exception {
                 runTest("compiler/testData/codegen/box/invokedynamic/lambdas/lambdaSerializable.kt");
@@ -16778,6 +16783,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class Sam extends AbstractLightAnalysisModeTest {
+            @TestMetadata("genericLambdaSignature.kt")
+            public void ignoreGenericLambdaSignature() throws Exception {
+                runTest("compiler/testData/codegen/box/invokedynamic/sam/genericLambdaSignature.kt");
+            }
+
             @TestMetadata("suspendFunInterface.kt")
             public void ignoreSuspendFunInterface() throws Exception {
                 runTest("compiler/testData/codegen/box/invokedynamic/sam/suspendFunInterface.kt");