azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: apply SAM if argument has postponed lambdas #KT-53966 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-01-19 13:58:38 +01:00
committed by Space Team
parent 5a9e8b3c0a
commit 898a9a0f2c
12 changed files with 173 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -27590,6 +27590,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/samConversions/samConversionWithCondition.kt");
}
@Test
@TestMetadata("samConversionWithConditionJava.kt")
public void testSamConversionWithConditionJava() throws Exception {
runTest("compiler/testData/diagnostics/tests/samConversions/samConversionWithConditionJava.kt");
}
@Test
@TestMetadata("samConversionsWithSmartCasts.kt")
public void testSamConversionsWithSmartCasts() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -27578,6 +27578,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/samConversions/samConversionWithCondition.kt");
}
@Test
@TestMetadata("samConversionWithConditionJava.kt")
public void testSamConversionWithConditionJava() throws Exception {
runTest("compiler/testData/diagnostics/tests/samConversions/samConversionWithConditionJava.kt");
}
@Test
@TestMetadata("samConversionsWithSmartCasts.kt")
public void testSamConversionsWithSmartCasts() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/Arguments.kt
+19
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.createFunctionType
import org.jetbrains.kotlin.fir.resolve.dfa.unwrapSmartcastExpression
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.resolve.inference.LambdaWithTypeVariableAsExpectedTypeAtom
import org.jetbrains.kotlin.fir.resolve.inference.model.ConeArgumentConstraintPosition
import org.jetbrains.kotlin.fir.resolve.inference.model.ConeReceiverConstraintPosition
import org.jetbrains.kotlin.fir.resolve.inference.preprocessCallableReference
@@ -38,6 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.SimpleConstraintSystem
import org.jetbrains.kotlin.types.AbstractTypeChecker
import org.jetbrains.kotlin.types.model.CaptureStatus
import org.jetbrains.kotlin.types.model.TypeSystemCommonSuperTypesContext
import org.jetbrains.kotlin.types.model.typeConstructor
import org.jetbrains.kotlin.utils.addToStdlib.runIf
val SAM_LOOKUP_NAME = Name.special("<SAM-CONSTRUCTOR>")
@@ -525,6 +527,16 @@ fun FirExpression.isFunctional(
if (classLikeExpectedFunctionType == null || coneType is ConeIntegerLiteralType) {
return false
}
val namedReferenceWithCandidate = namedReferenceWithCandidate()
if (namedReferenceWithCandidate?.candidate?.postponedAtoms?.any {
it is LambdaWithTypeVariableAsExpectedTypeAtom &&
it.expectedType.typeConstructor(session.typeContext) == coneType.typeConstructor(session.typeContext)
} == true
) {
return true
}
val invokeSymbol =
coneType.findContributedInvokeSymbol(
session, scopeSession, classLikeExpectedFunctionType, shouldCalculateReturnTypesOfFakeOverrides = false
@@ -567,6 +579,13 @@ fun FirExpression.isFunctional(
}
}
private fun FirExpression.namedReferenceWithCandidate(): FirNamedReferenceWithCandidate? =
when (this) {
is FirResolvable -> calleeReference as? FirNamedReferenceWithCandidate
is FirSafeCallExpression -> (selector as? FirExpression)?.namedReferenceWithCandidate()
else -> null
}
fun FirExpression.getExpectedType(
parameter: FirValueParameter/*, languageVersionSettings: LanguageVersionSettings*/
): ConeKotlinType {