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

FirCallResolver: perform int literal approximation also for var access

Browse Source 
Partial fix of KT-38473
This commit is contained in:
Mikhail Glukhikh
2020-04-22 15:54:46 +03:00
parent 5446795d12
commit 90fd2c6c4c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+11 -10
View File
@@ -63,22 +63,14 @@ class FirCallResolver(
fun resolveCallAndSelectCandidate(functionCall: FirFunctionCall): FirFunctionCall { fun resolveCallAndSelectCandidate(functionCall: FirFunctionCall): FirFunctionCall {
qualifiedResolver.reset() qualifiedResolver.reset()
@Suppress("NAME_SHADOWING") @Suppress("NAME_SHADOWING")
var functionCall = functionCall.transformExplicitReceiver(transformer, ResolutionMode.ContextIndependent) val functionCall = functionCall.transformExplicitReceiver(transformer, ResolutionMode.ContextIndependent)
.also { .also {
dataFlowAnalyzer.enterQualifiedAccessExpression(functionCall) dataFlowAnalyzer.enterQualifiedAccessExpression(functionCall)
functionCall.argumentList.transformArguments(transformer, ResolutionMode.ContextDependent) functionCall.argumentList.transformArguments(transformer, ResolutionMode.ContextDependent)
} }
val name = functionCall.calleeReference.name val name = functionCall.calleeReference.name
var result = collectCandidates(functionCall, name) val result = collectCandidates(functionCall, name)
if (
(result.candidates.isEmpty() || result.applicability < CandidateApplicability.SYNTHETIC_RESOLVED) &&
functionCall.explicitReceiver?.typeRef?.coneTypeSafe<ConeIntegerLiteralType>() != null
) {
functionCall = functionCall.transformExplicitReceiver(integerLiteralTypeApproximator, null)
result = collectCandidates(functionCall, name)
}
val nameReference = createResolvedNamedReference( val nameReference = createResolvedNamedReference(
functionCall.calleeReference, functionCall.calleeReference,
@@ -146,6 +138,15 @@ class FirCallResolver(
bestCandidates, discriminateGenerics = true, discriminateAbstracts = onSuperReference bestCandidates, discriminateGenerics = true, discriminateAbstracts = onSuperReference
) )
} }
if ((reducedCandidates.isEmpty() || result.currentApplicability < CandidateApplicability.SYNTHETIC_RESOLVED) &&
explicitReceiver?.typeRef?.coneTypeSafe<ConeIntegerLiteralType>() != null
) {
val approximatedQualifiedAccess = qualifiedAccess.transformExplicitReceiver(integerLiteralTypeApproximator, null)
if (approximatedQualifiedAccess.explicitReceiver?.typeRef?.coneTypeSafe<ConeIntegerLiteralType>() == null) {
return collectCandidates(approximatedQualifiedAccess, name)
}
}
return ResolutionResult(info, result.currentApplicability, reducedCandidates) return ResolutionResult(info, result.currentApplicability, reducedCandidates)
} }