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

FIR resolve: do not launch overload conflict resolve for erroneous

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-05-23 16:28:25 +03:00
parent 4d145db9f7
commit cb76ea5d14
1 changed files with 6 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/transformers/FirBodyResolveTransformer.kt
+6 -2
View File
@@ -554,8 +554,12 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
val consumer = createFunctionConsumer(session, name, info, inferenceComponents) val consumer = createFunctionConsumer(session, name, info, inferenceComponents)
val result = resolver.runTowerResolver(consumer, implicitReceiverStack.asReversed()) val result = resolver.runTowerResolver(consumer, implicitReceiverStack.asReversed())
val bestCandidates = result.bestCandidates() val bestCandidates = result.bestCandidates()
val reducedCandidates = ConeOverloadConflictResolver(TypeSpecificityComparator.NONE, inferenceComponents) val reducedCandidates = if (result.currentApplicability < CandidateApplicability.SYNTHETIC_RESOLVED) {
.chooseMaximallySpecificCandidates(bestCandidates, discriminateGenerics = false) bestCandidates.toSet()
} else {
ConeOverloadConflictResolver(TypeSpecificityComparator.NONE, inferenceComponents)
.chooseMaximallySpecificCandidates(bestCandidates, discriminateGenerics = false)
}
// fun isInvoke() // fun isInvoke()