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

ResultTypeResolver: don't allow Nothing as ILT subtype

Browse Source 
#KT-58379 Fixed
This commit is contained in:
Mikhail Glukhikh
2023-05-03 11:09:32 +02:00
committed by Space Team
parent 6ae648f6f6
commit 1c7ffb3276
3 changed files with 4 additions and 27 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
+3 -2
View File
@@ -94,12 +94,13 @@ class ResultTypeResolver(
// and the second one from UPPER/LOWER constraints (subType/superType based)
// The logic of choice here is:
// - if one type is null, we return another one
// - we return type from UPPER/LOWER constraints if it's more precise
// - we return type from UPPER/LOWER constraints if it's more precise (in fact, only Int/Short/Byte/Long is allowed here)
// - otherwise we return ILT-based type
return when {
resultTypeFromEqualConstraint == null -> resultTypeFromDirection
resultTypeFromDirection == null -> resultTypeFromEqualConstraint
AbstractTypeChecker.isSubtypeOf(c, resultTypeFromDirection, resultTypeFromEqualConstraint) -> resultTypeFromDirection
with(c) { !resultTypeFromDirection.typeConstructor().isNothingConstructor() } &&
AbstractTypeChecker.isSubtypeOf(c, resultTypeFromDirection, resultTypeFromEqualConstraint) -> resultTypeFromDirection
else -> resultTypeFromEqualConstraint
}
}