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

[FE] Make OverloadChecker take CR into account

Browse Source
This commit is contained in:
Anastasia.Shadrina
2021-12-14 06:39:51 +07:00
committed by teamcity
parent 2bb155edc1
commit 343a860553
14 changed files with 259 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/results/FlatSignature.kt
+12 -4
View File
@@ -66,11 +66,19 @@ private fun <T> SimpleConstraintSystem.isValueParameterTypeNotLessSpecific(
): Boolean {
val typeParameters = general.typeParameters
val typeSubstitutor = registerTypeVariables(typeParameters)
val valueParamsWithoutContextReceivers =
specific.valueParameterTypes.drop(specific.contextReceiverCount).map(typeKindSelector)
.zip(general.valueParameterTypes.drop(general.contextReceiverCount).map(typeKindSelector))
for ((specificType, generalType) in valueParamsWithoutContextReceivers) {
val specificContextReceiverCount = specific.contextReceiverCount
val generalContextReceiverCount = general.contextReceiverCount
var specificValueParameterTypes = specific.valueParameterTypes
var generalValueParameterTypes = general.valueParameterTypes
if (specificContextReceiverCount != generalContextReceiverCount) {
specificValueParameterTypes = specificValueParameterTypes.drop(specificContextReceiverCount)
generalValueParameterTypes = generalValueParameterTypes.drop(generalContextReceiverCount)
}
val valueParameters = specificValueParameterTypes.map(typeKindSelector).zip(generalValueParameterTypes.map(typeKindSelector))
for ((specificType, generalType) in valueParameters) {
if (specificType == null || generalType == null) continue
if (specificityComparator.isDefinitelyLessSpecific(specificType, generalType)) {