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

Don't compute default type for a fixing type variable for self type if the corresponding feature is disabled

Browse Source
This commit is contained in:
Victor Petukhov
2021-07-08 16:27:19 +03:00
parent 584facc95f
commit 967304ffca
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ResultTypeResolver.kt
+7 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.resolve.calls.inference.components package org.jetbrains.kotlin.resolve.calls.inference.components
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator
import org.jetbrains.kotlin.resolve.calls.inference.components.TypeVariableDirectionCalculator.ResolveDirection import org.jetbrains.kotlin.resolve.calls.inference.components.TypeVariableDirectionCalculator.ResolveDirection
@@ -26,6 +27,9 @@ class ResultTypeResolver(
fun isReified(variable: TypeVariableMarker): Boolean fun isReified(variable: TypeVariableMarker): Boolean
} }
private val isTypeInferenceForSelfTypesSupported: Boolean
get() = languageVersionSettings.supportsFeature(LanguageFeature.TypeInferenceOnCallsWithSelfTypes)
private fun Context.getDefaultTypeForSelfType( private fun Context.getDefaultTypeForSelfType(
constraints: List<Constraint>, constraints: List<Constraint>,
typeVariable: TypeVariableMarker typeVariable: TypeVariableMarker
@@ -46,7 +50,9 @@ class ResultTypeResolver(
constraints: List<Constraint>, constraints: List<Constraint>,
typeVariable: TypeVariableMarker typeVariable: TypeVariableMarker
): KotlinTypeMarker { ): KotlinTypeMarker {
getDefaultTypeForSelfType(constraints, typeVariable)?.let { return it } if (isTypeInferenceForSelfTypesSupported) {
getDefaultTypeForSelfType(constraints, typeVariable)?.let { return it }
}
return if (direction == ResolveDirection.TO_SUBTYPE) nothingType() else nullableAnyType() return if (direction == ResolveDirection.TO_SUBTYPE) nothingType() else nullableAnyType()
} }