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

Correctly map nullable generic underlying value of inline class

Browse Source 
if upper bound is primitive type.
 #KT-32162
This commit is contained in:
Ilmir Usmanov
2022-01-03 14:59:21 +01:00
parent 71729ec43c
commit 2fedb97d16
17 changed files with 478 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common.jvm/src/org/jetbrains/kotlin/types/expandedTypeUtils.kt
+3 -1
View File
@@ -25,9 +25,11 @@ private fun TypeSystemCommonBackendContext.computeExpandedTypeInner(
val upperBound = typeParameter.getRepresentativeUpperBound()
computeExpandedTypeInner(upperBound, visitedClassifiers)
?.let { expandedUpperBound ->
val upperBoundIsPrimitiveOrInlineClass =
upperBound.typeConstructor().isInlineClass() || upperBound is SimpleTypeMarker && upperBound.isPrimitiveType()
when {
expandedUpperBound is SimpleTypeMarker && expandedUpperBound.isPrimitiveType() &&
kotlinType.isNullableType() && upperBound.typeConstructor().isInlineClass() -> upperBound.makeNullable()
kotlinType.isNullableType() && upperBoundIsPrimitiveOrInlineClass -> upperBound.makeNullable()
expandedUpperBound.isNullableType() || !kotlinType.isMarkedNullable() -> expandedUpperBound
else -> expandedUpperBound.makeNullable()
}