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

[Commonizer] Restore lost nullability for underlying types in TAs

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-01-26 13:20:29 +03:00
parent 85f79695b9
commit 08cc904a71
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirTypeFactory.kt
+6 -1
View File
@@ -57,9 +57,14 @@ object CirTypeFactory {
Annotations.EMPTY Annotations.EMPTY
) as AbbreviatedType ) as AbbreviatedType
val expandedType = extractExpandedType(abbreviatedType)
val cirExpandedType = create(expandedType, useAbbreviation = true) as CirClassOrTypeAliasType
val cirExpandedTypeWithProperNullability = if (source.isMarkedNullable) makeNullable(cirExpandedType) else cirExpandedType
createTypeAliasType( createTypeAliasType(
typeAliasId = classifierDescriptor.internedClassId, typeAliasId = classifierDescriptor.internedClassId,
underlyingType = create(extractExpandedType(abbreviatedType), useAbbreviation = true) as CirClassOrTypeAliasType, underlyingType = cirExpandedTypeWithProperNullability,
arguments = createArguments(source.arguments, useAbbreviation = true), arguments = createArguments(source.arguments, useAbbreviation = true),
isMarkedNullable = source.isMarkedNullable isMarkedNullable = source.isMarkedNullable
) )