Psi2Ir: Fix SAM conversion with new inference

compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java

@@ -15065,6 +15065,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
             runTest("compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt");
         }
 
+        @TestMetadata("genericSamSmartcast.kt")
+        public void testGenericSamSmartcast() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");

compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/ArgumentsGenerationUtils.kt

@@ -613,12 +613,13 @@ fun StatementGenerator.generateSamConversionForValueArgumentsIfRequired(call: Ca
     for (i in underlyingValueParameters.indices) {
         val underlyingValueParameter = underlyingValueParameters[i]
 
-        val expectedSamConversionTypesForVararg = ArrayList<KotlinType?>()
+        val expectedSamConversionTypesForVararg =
-        if (expectSamConvertedArgumentToBeAvailableInResolvedCall && resolvedCall is NewResolvedCallImpl<*>) {
+            if (expectSamConvertedArgumentToBeAvailableInResolvedCall && resolvedCall is NewResolvedCallImpl<*>) {
-            val arguments = resolvedCall.valueArguments[originalValueParameters[i]]?.arguments ?: continue
+                val arguments = resolvedCall.valueArguments[originalValueParameters[i]]?.arguments
-            arguments.mapTo(expectedSamConversionTypesForVararg) { resolvedCall.getExpectedTypeForSamConvertedArgument(it) }
+                arguments?.map { resolvedCall.getExpectedTypeForSamConvertedArgument(it) }
-            if (expectedSamConversionTypesForVararg.all { it == null }) continue
+            } else null
-        } else {
+
+        if (expectedSamConversionTypesForVararg?.all { it == null } != false) {
             // When the method is `f(T)` with `T` = a SAM type, the substituted type is a SAM while the original is not;
             // when the method is `f(X<T>)` with `T` = `out V` where `X` is a SAM type, the substituted type is `Nothing`
             // while the original is a SAM interface. Thus, if *either* of those is a SAM type then it's fine.
@@ -675,8 +676,7 @@ fun StatementGenerator.generateSamConversionForValueArgumentsIfRequired(call: Ca
                 ).apply {
                     originalArgument.elements.mapIndexedTo(elements) { index, element ->
                         if (element is IrExpression) {
-                            val samType = expectedSamConversionTypesForVararg[index]
+                            if (expectedSamConversionTypesForVararg?.get(index) != null)
-                            if (samType != null)
                                 samConvertScalarExpression(element)
                             else
                                 element

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/ExternalDependenciesGenerator.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.ir.util
 
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
@@ -32,11 +31,6 @@ class ExternalDependenciesGenerator(
     private val languageVersionSettings: LanguageVersionSettings
 ) {
     fun generateUnboundSymbolsAsDependencies() {
-        if (languageVersionSettings.supportsFeature(LanguageFeature.NewInference)) {
-            require(symbolTable.unboundTypeParameters.isEmpty()) {
-                "Unbound type parameters are forbidden: ${symbolTable.unboundTypeParameters}"
-            }
-        }
         // There should be at most one DeclarationStubGenerator (none in closed world?)
         irProviders.singleOrNull { it is DeclarationStubGenerator }?.let {
             (it as DeclarationStubGenerator).unboundSymbolGeneration = true

compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt

@@ -1,6 +1,4 @@
 // TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM_IR
-
 // FILE: example/Hello.java
 
 package example;

compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt

@@ -0,0 +1,21 @@
+// TARGET_BACKEND: JVM
+// FILE: A.java
+public class A<T> {
+    public interface I<T> {
+        String apply(T x);
+    }
+
+    public String call(I<T> block) { return block.apply(null); }
+}
+
+// FILE: test.kt
+fun f(x: Any): String {
+    if (x is A<*>) {
+        return x.call { y: Any? -> "OK" }
+    }
+    return "Fail"
+}
+
+fun box(): String {
+    return f(A<Int>())
+}

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java

@@ -16290,6 +16290,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt");
         }
 
+        @TestMetadata("genericSamSmartcast.kt")
+        public void testGenericSamSmartcast() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");

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

@@ -16290,6 +16290,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt");
         }
 
+        @TestMetadata("genericSamSmartcast.kt")
+        public void testGenericSamSmartcast() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java

@@ -15065,6 +15065,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/javaInterop/genericSamProjectedOutWithNewInference.kt");
         }
 
+        @TestMetadata("genericSamSmartcast.kt")
+        public void testGenericSamSmartcast() throws Exception {
+            runTest("compiler/testData/codegen/box/javaInterop/genericSamSmartcast.kt");
+        }
+
         @TestMetadata("lambdaInstanceOf.kt")
         public void testLambdaInstanceOf() throws Exception {
             runTest("compiler/testData/codegen/box/javaInterop/lambdaInstanceOf.kt");