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

FIR: handle ambiguity more precisely during constructor processing

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-03-14 16:11:57 +03:00
committed by Space
parent 87a7408ddf
commit 901336e6e9
1 changed files with 8 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/ConstructorProcessing.kt
+8 -3
View File
@@ -107,8 +107,9 @@ private fun FirScope.getFirstClassifierOrNull(
when { when {
isSuccessCandidate && !isSuccessResult -> { isSuccessCandidate && !isSuccessResult -> {
// any result is better than no result // successful result is better than unsuccessful
isSuccessResult = true isSuccessResult = true
isAmbiguousResult = false
result = SymbolWithSubstitutor(symbol, substitutor) result = SymbolWithSubstitutor(symbol, substitutor)
} }
result?.symbol === symbol -> { result?.symbol === symbol -> {
@@ -116,8 +117,12 @@ private fun FirScope.getFirstClassifierOrNull(
return@processClassifiersByNameWithSubstitution return@processClassifiersByNameWithSubstitution
} }
result != null -> { result != null -> {
// results are similar => ambiguity if (isSuccessResult == isSuccessCandidate) {
isAmbiguousResult = true // results are similar => ambiguity
isAmbiguousResult = true
} else {
// ignore unsuccessful result if we have successful one
}
} }
else -> { else -> {
// result == null: any result is better than no result // result == null: any result is better than no result