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

FIR: strengthen resolution success check for augmented array set call

Browse Source 
This commit removes some false ambiguities &
fixes compilation of tree-generator module with FIR
This commit is contained in:
Jinseong Jeon
2020-12-18 00:06:46 -08:00
committed by TeamCityServer
parent 9bf2dfaa02
commit 9c2d06cf70
8 changed files with 88 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+5 -2
View File
@@ -867,8 +867,11 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform
}
val secondResult = augmentedArraySetCall.assignCall.transformSingle(transformer, ResolutionMode.ContextIndependent)
val firstSucceed = firstCalls.all { it.typeRef !is FirErrorTypeRef }
val secondSucceed = secondCalls.all { it.typeRef !is FirErrorTypeRef }
fun isSuccessful(functionCall: FirFunctionCall): Boolean =
functionCall.typeRef !is FirErrorTypeRef && functionCall.calleeReference is FirResolvedNamedReference
val firstSucceed = firstCalls.all(::isSuccessful)
val secondSucceed = secondCalls.all(::isSuccessful)
val result: FirStatement = when {
firstSucceed && secondSucceed -> {