JVM: enable indy lambdas in some tests explicitly

To simplify enabling of indy lambdas by default.

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

@@ -27975,6 +27975,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @Test
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @Test
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {

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

@@ -27975,6 +27975,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @Test
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @Test
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/capturedSamArgument.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 3 java/lang/invoke/LambdaMetafactory
 
 // FILE: capturedSamArgument.kt
 fun box(): String {

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/capturingLambda.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: capturingLambda.kt
 fun box(): String {

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/extensionLambda1.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: extensionLambda1.kt
 fun samExtLambda(ext: String.() -> String) = Sam(ext)

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/extensionLambda2.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: extensionLambda2.kt
 fun samExtLambda(ext: String.(String) -> String) = Sam(ext)

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/genericSam2.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: genericSam2.kt
 

compiler/testData/codegen/box/invokedynamic/sam/functionExprToJavaInterface/simple.kt

@@ -1,10 +1,11 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: simple.kt
 val lambda = { "OK" }

compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/highOrderFunRef.kt

@@ -1,11 +1,12 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 // WITH_STDLIB
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: highOrderFunRef.kt
 

compiler/testData/codegen/box/invokedynamic/sam/functionRefToJavaInterface/inlineHighOrderFunRef.kt

@@ -1,11 +1,12 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 // WITH_STDLIB
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: inlineHighOrderFunRef.kt
 

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

@@ -1,12 +1,13 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 // WITH_STDLIB
 // FULL_JDK
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 // FILE: inlineFunWithPrivateMethod.kt
 

compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt

@@ -1,6 +1,7 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: CLASS
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES

compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt

@@ -0,0 +1,27 @@
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
+
+// CHECK_BYTECODE_TEXT
+// JVM_IR_TEMPLATES
+// 1 java/lang/invoke/LambdaMetafactory
+
+// ^ Since indy for SAM types with contravariant projections is disabled (see genericWithInProjection.kt), the bytecode in this test is
+//   suboptimal. The lambda is generated via invokedynamic LambdaMetafactory and then wrapped into an instance of Cmp.
+//   The optimal way would be to generate the Cmp instance via invokedynamic LambdaMetafactory directly.
+
+fun interface Cmp<T> {
+    fun compare(a: T, b: T): Int
+}
+
+fun <T> foo(comparator: Cmp<in T>, a: T, b: T) = comparator.compare(a, b)
+
+fun bar(x: Int, y: Int) = foo({ a, b -> a - b}, x, y)
+
+fun box(): String {
+    val t = bar(42, 117)
+    if (t != -75)
+        return "Failed: t=$t"
+    return "OK"
+}

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

@@ -1,6 +1,7 @@
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // SAM_CONVERSIONS: INDY
+// LAMBDAS: INDY
 // WITH_STDLIB
 // FULL_JDK
 
@@ -9,7 +10,7 @@
 
 // CHECK_BYTECODE_TEXT
 // JVM_IR_TEMPLATES
-// 1 java/lang/invoke/LambdaMetafactory
+// 2 java/lang/invoke/LambdaMetafactory
 
 import java.util.stream.Collectors
 

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

@@ -26901,6 +26901,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @Test
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @Test
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {

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

@@ -27975,6 +27975,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @Test
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @Test
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {

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

@@ -27975,6 +27975,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @Test
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @Test
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {

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

@@ -22699,6 +22699,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjection.kt");
                 }
 
+                @TestMetadata("genericWithInProjectionWithIndyLambdas.kt")
+                public void testGenericWithInProjectionWithIndyLambdas() throws Exception {
+                    runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithInProjectionWithIndyLambdas.kt");
+                }
+
                 @TestMetadata("genericWithStarProjection.kt")
                 public void testGenericWithStarProjection() throws Exception {
                     runTest("compiler/testData/codegen/box/invokedynamic/sam/specializedGenerics/genericWithStarProjection.kt");