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

Introduce substitution to ConeTypeContext.captureFromArguments

Browse Source 
This commit itself does not influence anything
This commit is contained in:
Mikhail Glukhikh
2020-09-07 19:20:59 +03:00
parent 414842343d
commit e83f3bbf04
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+7 -1
View File
@@ -328,6 +328,10 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
ConeCapturedType(status, lowerType, argument, typeConstructor.getParameter(index)) ConeCapturedType(status, lowerType, argument, typeConstructor.getParameter(index))
} }
val substitutor = substitutorByMap((0 until argumentsCount).map { index ->
(typeConstructor.getParameter(index) as ConeTypeParameterLookupTag).toSymbol() to (newArguments[index] as ConeKotlinType)
}.toMap())
for (index in 0 until argumentsCount) { for (index in 0 until argumentsCount) {
val oldArgument = type.typeArguments[index] val oldArgument = type.typeArguments[index]
val newArgument = newArguments[index] val newArgument = newArguments[index]
@@ -336,7 +340,9 @@ interface ConeTypeContext : TypeSystemContext, TypeSystemOptimizationContext, Ty
val parameter = typeConstructor.getParameter(index) val parameter = typeConstructor.getParameter(index)
val upperBounds = (0 until parameter.upperBoundCount()).mapTo(mutableListOf()) { paramIndex -> val upperBounds = (0 until parameter.upperBoundCount()).mapTo(mutableListOf()) { paramIndex ->
parameter.getUpperBound(paramIndex) // TODO: substitution substitutor.safeSubstitute(
this as TypeSystemInferenceExtensionContext, parameter.getUpperBound(paramIndex)
)
} }
if (!oldArgument.isStarProjection() && oldArgument.getVariance() == TypeVariance.OUT) { if (!oldArgument.isStarProjection() && oldArgument.getVariance() == TypeVariance.OUT) {