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

[NI] Don't try performing any conversions on receivers

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2020-05-25 09:52:32 +03:00
parent de69962e9d
commit 59f027e3e9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ResolutionParts.kt
+3 -1
View File
@@ -415,8 +415,9 @@ private fun KotlinResolutionCandidate.resolveKotlinArgument(
) { ) {
val candidateExpectedType = candidateParameter?.let { argument.getExpectedType(it, callComponents.languageVersionSettings) } val candidateExpectedType = candidateParameter?.let { argument.getExpectedType(it, callComponents.languageVersionSettings) }
val isReceiver = receiverInfo.isReceiver
val conversionDataBeforeSubtyping = val conversionDataBeforeSubtyping =
if (candidateParameter == null || candidateExpectedType == null) { if (isReceiver || candidateParameter == null || candidateExpectedType == null) {
null null
} else { } else {
TypeConversions.performCompositeConversionBeforeSubtyping( TypeConversions.performCompositeConversionBeforeSubtyping(
@@ -440,6 +441,7 @@ private fun KotlinResolutionCandidate.resolveKotlinArgument(
if (candidateExpectedType == null || // Nothing to convert if (candidateExpectedType == null || // Nothing to convert
convertedExpectedType != null || // Type is already converted convertedExpectedType != null || // Type is already converted
isReceiver || // Receivers don't participate in conversions
conversionDataBeforeSubtyping?.wasConversion == true || // We tried to convert type but failed conversionDataBeforeSubtyping?.wasConversion == true || // We tried to convert type but failed
conversionDataBeforeSubtyping?.conversionDefinitelyNotNeeded == true || conversionDataBeforeSubtyping?.conversionDefinitelyNotNeeded == true ||
csBuilder.hasContradiction csBuilder.hasContradiction