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

[FIR] Fix captured type arguments of local class as callable reference LHS

Browse Source 
#KT-66267
This commit is contained in:
Kirill Rakhman
2024-03-05 16:14:27 +01:00
committed by Space Team
parent 66212c0ec6
commit 4c93e9cff6
24 changed files with 163 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -4810,6 +4810,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java
Generated
+6
View File
@@ -4810,6 +4810,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirTypeArgumentsOfQualifierOfCallableReferenceChecker.kt
+1
View File
@@ -23,6 +23,7 @@ object FirTypeArgumentsOfQualifierOfCallableReferenceChecker : FirCallableRefere
val lhs = expression.explicitReceiver as? FirResolvedQualifier ?: return
val correspondingDeclaration = lhs.symbol ?: return
// TODO(KT-66344) Support inner classes
var typeArgumentsWithSourceInfo = lhs.typeArguments.toTypeArgumentsWithSourceInfo()
var typeParameterSymbols = correspondingDeclaration.typeParameterSymbols.filter { it.containingDeclarationSymbol is FirClassLikeSymbol }
if (typeParameterSymbols.size != typeArgumentsWithSourceInfo.size) {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirDoubleColonExpressionResolver.kt
+24 -10
View File
@@ -9,11 +9,14 @@ package org.jetbrains.kotlin.fir.resolve
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirOuterClassTypeParameterRef
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
import org.jetbrains.kotlin.fir.declarations.utils.expandedConeType
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.FirNamedReference
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.types.Variance
@@ -145,17 +148,28 @@ class FirDoubleColonExpressionResolver(private val session: FirSession) {
firClassLikeDeclaration.symbol.toLookupTag(),
Array(firClassLikeDeclaration.typeParameters.size) { index ->
val typeArgument = expression.typeArguments.getOrNull(index)
if (typeArgument == null) ConeStarProjection
else when (typeArgument) {
is FirTypeProjectionWithVariance -> {
val coneType = typeArgument.typeRef.coneType
when (typeArgument.variance) {
Variance.INVARIANT -> coneType
Variance.IN_VARIANCE -> ConeKotlinTypeProjectionIn(coneType)
Variance.OUT_VARIANCE -> ConeKotlinTypeProjectionOut(coneType)
}
if (typeArgument == null) {
// We currently only support local classes with captured type parameters from non-classes
// (i.e. local class in generic function).
// TODO(KT-66344) Support inner classes
val typeParameter = firClassLikeDeclaration.typeParameters[0]
if (firClassLikeDeclaration.isLocal && typeParameter is FirOuterClassTypeParameterRef && typeParameter.symbol.containingDeclarationSymbol !is FirClassSymbol) {
typeParameter.symbol.defaultType
} else {
ConeStarProjection
}
} else {
when (typeArgument) {
is FirTypeProjectionWithVariance -> {
val coneType = typeArgument.typeRef.coneType
when (typeArgument.variance) {
Variance.INVARIANT -> coneType
Variance.IN_VARIANCE -> ConeKotlinTypeProjectionIn(coneType)
Variance.OUT_VARIANCE -> ConeKotlinTypeProjectionOut(coneType)
}
}
else -> ConeStarProjection
}
else -> ConeStarProjection
}
},
isNullable = resolvedExpression.isNullableLHSForCallableReference
compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
import kotlin.reflect.KProperty1
fun <T> genericFun(value: T): T {
class Local(val item: T)
val unwrapItem: KProperty1<Local, T> = Local::item
return unwrapItem(Local(value))
}
fun box(): String {
return genericFun("OK")
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -4595,6 +4595,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java
Generated
+6
View File
@@ -4793,6 +4793,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -4195,6 +4195,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfStaticMethod.kt");
}
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
runTest("compiler/testData/codegen/box/callableReference/charArrayOf.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3551,6 +3551,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3551,6 +3551,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3551,6 +3551,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3551,6 +3551,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3637,6 +3637,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -3721,6 +3721,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3553,6 +3553,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/blackbox/NativeCodegenBoxTestNoPLGenerated.java
Generated
+6
View File
@@ -3638,6 +3638,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3539,6 +3539,12 @@ public class FirWasmJsCodegenBoxTestGenerated extends AbstractFirWasmJsCodegenBo
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {
wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -3539,6 +3539,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
runTest("compiler/testData/codegen/box/callableReference/callableReferenceOfObjectMethod.kt");
}
@Test
@TestMetadata("callableReferencetoInnerAndLocal.kt")
public void testCallableReferencetoInnerAndLocal() {
runTest("compiler/testData/codegen/box/callableReference/callableReferencetoInnerAndLocal.kt");
}
@Test
@TestMetadata("charArrayOf.kt")
public void testCharArrayOf() {