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

[FIR] Process implicit receivers in calls with contract

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-04-10 17:08:18 +03:00
parent 300c3c30fb
commit 9b903b5e13
2 changed files with 5 additions and 8 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
+2 -2
View File
@@ -728,8 +728,8 @@ abstract class FirDataFlowAnalyzer<FLOW : Flow>(
else -> throw IllegalArgumentException("Unsupported constant reference: $value") else -> throw IllegalArgumentException("Unsupported constant reference: $value")
} }
} }
graphBuilder.exitContract(functionCall).mergeIncomingFlow() graphBuilder.exitContract(functionCall).mergeIncomingFlow(updateReceivers = true)
contractDescriptionVisitingMode = true contractDescriptionVisitingMode = false
} }
fun exitConstExpresion(constExpression: FirConstExpression<*>) { fun exitConstExpresion(constExpression: FirConstExpression<*>) {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/contracts/ConeConditionalEffectToFirVisitor.kt
+3 -6
View File
@@ -8,9 +8,8 @@ package org.jetbrains.kotlin.fir.resolve.dfa.contracts
import org.jetbrains.kotlin.fir.contracts.description.* import org.jetbrains.kotlin.fir.contracts.description.*
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.references.impl.FirSimpleNamedReference
import org.jetbrains.kotlin.fir.expressions.FirConstKind
import org.jetbrains.kotlin.fir.expressions.builder.* import org.jetbrains.kotlin.fir.expressions.builder.*
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference
import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
@@ -89,10 +88,8 @@ fun ConeConditionalEffectDeclaration.buildContractFir(argumentMapping: Map<Int,
fun createArgumentsMapping(functionCall: FirFunctionCall): Map<Int, FirExpression>? { fun createArgumentsMapping(functionCall: FirFunctionCall): Map<Int, FirExpression>? {
val function = functionCall.toResolvedCallableSymbol()?.fir as? FirSimpleFunction ?: return null val function = functionCall.toResolvedCallableSymbol()?.fir as? FirSimpleFunction ?: return null
val argumentsMapping = mutableMapOf<Int, FirExpression>() val argumentsMapping = mutableMapOf<Int, FirExpression>()
// TODO: process implicit receiver functionCall.extensionReceiver.takeIf { it != FirNoReceiverExpression }?.let { argumentsMapping[-1] = it }
// TODO: change to mapping from candidate ?: functionCall.dispatchReceiver.takeIf { it != FirNoReceiverExpression }?.let { argumentsMapping[-1] = it }
// problem: we have already resolved reference without candidate
functionCall.explicitReceiver?.let { argumentsMapping[-1] = it }
val nameToIndex = function.valueParameters.mapIndexed { index, parameter -> parameter.name to index }.toMap() val nameToIndex = function.valueParameters.mapIndexed { index, parameter -> parameter.name to index }.toMap()