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

Inference: use generic version of error type in type approximator

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-18 12:25:36 +03:00
committed by Simon Ogorodnik
parent db8bd8c197
commit b8e6291265
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/types/TypeApproximator.kt
+3 -1
View File
@@ -117,6 +117,8 @@ abstract class AbstractTypeApproximator(val ctx: TypeSystemInferenceExtensionCon
private val referenceApproximateToSuperType = this::approximateSimpleToSuperType private val referenceApproximateToSuperType = this::approximateSimpleToSuperType
private val referenceApproximateToSubType = this::approximateSimpleToSubType private val referenceApproximateToSubType = this::approximateSimpleToSubType
open fun createErrorType(message: String): SimpleTypeMarker =
ErrorUtils.createErrorType(message)
// null means that this input type is the result, i.e. input type not contains not-allowed kind of types // null means that this input type is the result, i.e. input type not contains not-allowed kind of types
@@ -393,7 +395,7 @@ abstract class AbstractTypeApproximator(val ctx: TypeSystemInferenceExtensionCon
// val arguments = type.arguments // val arguments = type.arguments
if (typeConstructor.parametersCount() != type.argumentsCount()) { if (typeConstructor.parametersCount() != type.argumentsCount()) {
return if (conf.errorType) { return if (conf.errorType) {
ErrorUtils.createErrorType("Inconsistent type: $type (parameters.size = ${typeConstructor.parametersCount()}, arguments.size = ${type.argumentsCount()})") createErrorType("Inconsistent type: $type (parameters.size = ${typeConstructor.parametersCount()}, arguments.size = ${type.argumentsCount()})")
} else type.defaultResult(toSuper) } else type.defaultResult(toSuper)
} }