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

Restore nullability after type refinement along with annotations

Browse Source 
See the issue for details

^KT-42546 Fixed
This commit is contained in:
Dmitry Savvinov
2020-10-08 16:20:56 +03:00
parent ee794f8664
commit e06ae01c0c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/KotlinTypeRefinerImpl.kt
+6 -1
View File
@@ -67,7 +67,8 @@ class KotlinTypeRefinerImpl(
val cached = refinedTypeCache.computeIfAbsent(type.constructor) { val cached = refinedTypeCache.computeIfAbsent(type.constructor) {
type.constructor.declarationDescriptor!!.defaultType.refine(this) type.constructor.declarationDescriptor!!.defaultType.refine(this)
} }
cached.replace(type.arguments)
cached.restoreAdditionalTypeInformation(type)
} }
else -> type.refine(this) else -> type.refine(this)
} }
@@ -146,3 +147,7 @@ private val TypeConstructor.allDependentTypeConstructors: Collection<TypeConstru
private fun TypeConstructor.isExpectClass() = private fun TypeConstructor.isExpectClass() =
declarationDescriptor?.safeAs<ClassDescriptor>()?.isExpect == true declarationDescriptor?.safeAs<ClassDescriptor>()?.isExpect == true
private fun KotlinType.restoreAdditionalTypeInformation(prototype: KotlinType): KotlinType {
return TypeUtils.makeNullableAsSpecified(this, prototype.isMarkedNullable).replace(prototype.arguments)
}