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

FIR: discriminate generics during callable reference resolve

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-08-04 11:30:25 +03:00
committed by teamcityserver
parent e924ee3150
commit 22ccb7a943
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.fir.txt
Vendored
+1 -1
View File
@@ -5,5 +5,5 @@ FILE: DailyAggregatedDoubleFactor.kt
^aggregateBy R|kotlin/collections/mutableMapOf|<R|kotlin/String|, R|kotlin/Double|>() ^aggregateBy R|kotlin/collections/mutableMapOf|<R|kotlin/String|, R|kotlin/Double|>()
} }
public final fun R|DailyAggregatedDoubleFactor|.aggregateMin(): R|kotlin/collections/Map<kotlin/String, kotlin/Double>| { public final fun R|DailyAggregatedDoubleFactor|.aggregateMin(): R|kotlin/collections/Map<kotlin/String, kotlin/Double>| {
^aggregateMin this@R|/aggregateMin|.R|/aggregateBy|(::<Ambiguity: minOf, [kotlin/comparisons/minOf, kotlin/comparisons/minOf]>#) ^aggregateMin this@R|/aggregateMin|.R|/aggregateBy|(::R|kotlin/comparisons/minOf|)
} }
compiler/fir/analysis-tests/testData/resolveWithStdlib/intellij/DailyAggregatedDoubleFactor.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ private fun DailyAggregatedDoubleFactor.aggregateBy(reduce: (Double, Double) ->
return mutableMapOf<String, Double>() return mutableMapOf<String, Double>()
} }
fun DailyAggregatedDoubleFactor.aggregateMin(): Map<String, Double> = aggregateBy(::<!OVERLOAD_RESOLUTION_AMBIGUITY!>minOf<!>) fun DailyAggregatedDoubleFactor.aggregateMin(): Map<String, Double> = aggregateBy(::minOf)
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt
+1 -1
View File
@@ -365,7 +365,7 @@ class FirCallResolver(
val reducedCandidates = if (noSuccessfulCandidates) { val reducedCandidates = if (noSuccessfulCandidates) {
bestCandidates.toSet() bestCandidates.toSet()
} else { } else {
conflictResolver.chooseMaximallySpecificCandidates(bestCandidates, discriminateGenerics = false) conflictResolver.chooseMaximallySpecificCandidates(bestCandidates, discriminateGenerics = true)
} }
(callableReferenceAccess.explicitReceiver as? FirResolvedQualifier)?.replaceResolvedToCompanionObject( (callableReferenceAccess.explicitReceiver as? FirResolvedQualifier)?.replaceResolvedToCompanionObject(