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

Minor. Reformat PCLA related part at ResultTypeResolver

Browse Source
This commit is contained in:
Denis.Zharkov
2024-02-07 15:18:58 +01:00
committed by Space Team
parent 05b5cdc918
commit b86c0d990e
1 changed files with 13 additions and 6 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
+13 -6
View File
@@ -222,12 +222,19 @@ class ResultTypeResolver(
!lowerType.contains { it.asSimpleType()?.isStubTypeForVariableInSubtyping() == true } !lowerType.contains { it.asSimpleType()?.isStubTypeForVariableInSubtyping() == true }
} }
if (typesWithoutStubs.isNotEmpty()) { when {
commonSuperType = computeCommonSuperType(typesWithoutStubs) typesWithoutStubs.isNotEmpty() -> {
} else if (outerSystemVariablesPrefixSize > 0) { commonSuperType = computeCommonSuperType(typesWithoutStubs)
// outerSystemVariablesPrefixSize > 0 only for PCLA (K2) }
@OptIn(K2Only::class) // `typesWithoutStubs.isEmpty()` means that there are no lower constraints without type variables.
commonSuperType = createSubstitutionFromSubtypingStubTypesToTypeVariables().safeSubstitute(commonSuperType) // It's only possible for the PCLA case, because otherwise none of the constraints would be considered as proper.
// So, we just get currently computed `commonSuperType` and substitute all local stub types
// with corresponding type variables.
outerSystemVariablesPrefixSize > 0 -> {
// outerSystemVariablesPrefixSize > 0 only for PCLA (K2)
@OptIn(K2Only::class)
commonSuperType = createSubstitutionFromSubtypingStubTypesToTypeVariables().safeSubstitute(commonSuperType)
}
} }
} }