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

FIR: skip extra non-valid groups during candidate resolve

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-07-15 14:09:41 +03:00
parent b813f22cfe
commit fff954ed3f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallResolver.kt
+2 -1
View File
@@ -394,7 +394,8 @@ abstract class TowerDataConsumer {
fun skipGroup(group: Int, resultCollector: CandidateCollector): Boolean { fun skipGroup(group: Int, resultCollector: CandidateCollector): Boolean {
if (resultCollector.isSuccess() && stopGroup == Int.MAX_VALUE) { if (resultCollector.isSuccess() && stopGroup == Int.MAX_VALUE) {
stopGroup = group stopGroup = group
} else if (group > stopGroup) return true }
if (group >= stopGroup) return true
return false return false
} }
} }
compiler/fir/resolve/testData/resolve/expresssions/invoke/propertyFromParameter.txt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ FILE: propertyFromParameter.kt
super<R|kotlin/Any|>() super<R|kotlin/Any|>()
} }
public final val name: <ERROR TYPE REF: cycle> = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|() public final val name: R|kotlin/String| = R|<local>/name|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/String|>|()
public get(): <ERROR TYPE REF: cycle> public get(): R|kotlin/String|
} }