diff options
| author | Dmitry Savvinov <dmitry.savvinov@jetbrains.com> | 2020-07-10 20:02:44 +0700 |
|---|---|---|
| committer | Dmitry Savvinov <dmitry.savvinov@jetbrains.com> | 2020-07-13 14:13:44 +0700 |
| commit | 0d5b8c569c4d77d4ffbdc3f1abe1f70cd4444ccb (patch) | |
| tree | 8e21ba88db43c218cc6c31bee9e2a943e7ba7720 | |
| parent | 5c4a1b2552594ec4f11c332b23981778cbae6838 (diff) | |
| download | kotlin-0d5b8c569c4d77d4ffbdc3f1abe1f70cd4444ccb.tar.gz | |
Force expansion to have the same nullability as abbreviation
Note that classifier.underlyingType is always non-nullable, but
abbreviation might be nullable, so we should keep them consistent
^KT-40199 Fixed
| -rw-r--r-- | native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt index 902da49e334..b6e5b894e85 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt @@ -133,7 +133,7 @@ internal fun CirSimpleType.buildType( ) val computedType = if (classifier is TypeAliasDescriptor) - classifier.underlyingType.withAbbreviation(simpleType) + classifier.underlyingType.makeNullableAsSpecified(simpleType.isMarkedNullable).withAbbreviation(simpleType) else simpleType |