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

FIR: Lookup contained postponed atoms recursively in delegate inference

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-11-23 15:49:38 +03:00
committed by teamcity
parent 26b158bded
commit 1a288fcdcd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt
+9 -2
View File
@@ -195,8 +195,15 @@ class FirDelegatedPropertyInferenceSession(
notCompletedCalls as List<FirStatement>, notCompletedCalls as List<FirStatement>,
unitType, resolutionContext unitType, resolutionContext
) { lambdaAtom -> ) { lambdaAtom ->
val containingCandidateForLambda = notCompletedCalls.first { // Reversed here bc we want top-most call to avoid exponential visit
it.candidate.postponedAtoms.contains(lambdaAtom) val containingCandidateForLambda = notCompletedCalls.asReversed().first {
var found = false
it.processAllContainingCallCandidates(processBlocks = true) { subCandidate ->
if (subCandidate.postponedAtoms.contains(lambdaAtom)) {
found = true
}
}
found
}.candidate }.candidate
postponedArgumentsAnalyzer.analyze( postponedArgumentsAnalyzer.analyze(
commonSystem.asPostponedArgumentsAnalyzerContext(), commonSystem.asPostponedArgumentsAnalyzerContext(),