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

[FIR] Fix resolving of refs with implicit this in lambdas in smartcasts

Browse Source
This commit is contained in:
Ivan Kochurkin
2022-03-20 20:17:00 +03:00
committed by teamcity
parent c6f52893fb
commit 48dbb9ceb9
8 changed files with 46 additions and 3 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
@@ -27932,6 +27932,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/tests/smartCasts/implicitReceiver.kt");
}
@Test
@TestMetadata("implicitThisOnRefInLambdaInSmartcast.kt")
public void testImplicitThisOnRefInLambdaInSmartcast() throws Exception {
runTest("compiler/testData/diagnostics/tests/smartCasts/implicitThisOnRefInLambdaInSmartcast.kt");
}
@Test
@TestMetadata("implicitToGrandSon.kt")
public void testImplicitToGrandSon() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
+6
View File
@@ -27932,6 +27932,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/tests/smartCasts/implicitReceiver.kt");
}
@Test
@TestMetadata("implicitThisOnRefInLambdaInSmartcast.kt")
public void testImplicitThisOnRefInLambdaInSmartcast() throws Exception {
runTest("compiler/testData/diagnostics/tests/smartCasts/implicitThisOnRefInLambdaInSmartcast.kt");
}
@Test
@TestMetadata("implicitToGrandSon.kt")
public void testImplicitToGrandSon() throws Exception {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+5 -3
View File
@@ -105,14 +105,15 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
val index = receiverStack.getReceiverIndex(symbol) ?: return
val info = flow.getTypeStatement(variable)
if (info == null) {
receiverStack.replaceReceiverType(index, receiverStack.getOriginalType(index))
val type = if (info == null) {
receiverStack.getOriginalType(index)
} else {
val types = info.exactType.toMutableList().also {
it += receiverStack.getOriginalType(index)
}
receiverStack.replaceReceiverType(index, context.intersectTypesOrNull(types)!!)
context.intersectTypesOrNull(types)!!
}
receiverStack.replaceReceiverType(index, type)
}
override fun updateAllReceivers(flow: PersistentFlow) {
@@ -282,6 +283,7 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
// TODO: questionable
postponedLambdaEnterNode?.mergeIncomingFlow()
functionEnterNode.mergeIncomingFlow()
logicSystem.updateAllReceivers(functionEnterNode.flow)
}
private fun exitAnonymousFunction(anonymousFunction: FirAnonymousFunction): FirControlFlowGraphReference {