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

[FIR] Cleanup data flow analysis of safe calls

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-03-04 11:50:52 +03:00
parent 2cb24fbd49
commit f8adce8b96
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+5 -5
View File
@@ -792,17 +792,17 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
fun exitSafeCall(safeCall: FirSafeCallExpression) {
val node = graphBuilder.exitSafeCall().mergeIncomingFlow()
val previousFlow = node.previousFlow
val flow = node.flow
val variable = variableStorage.getOrCreateVariable(previousFlow, safeCall)
val variable = variableStorage.getOrCreateVariable(flow, safeCall)
val receiverVariable = when (variable) {
// There is some bug with invokes. See KT-36014
is RealVariable -> variable.explicitReceiverVariable ?: return
is SyntheticVariable -> variableStorage.getOrCreateVariable(previousFlow, safeCall.receiver)
is SyntheticVariable -> variableStorage.getOrCreateVariable(flow, safeCall.receiver)
}
logicSystem.addImplication(node.flow, (variable notEq null) implies (receiverVariable notEq null))
logicSystem.addImplication(flow, (variable notEq null) implies (receiverVariable notEq null))
if (receiverVariable.isReal()) {
logicSystem.addImplication(node.flow, (variable notEq null) implies (receiverVariable typeEq any))
logicSystem.addImplication(flow, (variable notEq null) implies (receiverVariable typeEq any))
}
}