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

[Commonizer] Use kotlin/Any as the default supertype for commonized class

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-02-01 21:52:15 +03:00
parent 2438265ba8
commit 6fe5f85da7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/CommonizationVisitor.kt
+7 -3
View File
@@ -148,11 +148,15 @@ internal class CommonizationVisitor(
classId: ClassId, classId: ClassId,
supertypesMap: Map<CirType, CommonizedGroup<CirType>>? supertypesMap: Map<CirType, CommonizedGroup<CirType>>?
) { ) {
val commonSupertypes = supertypesMap?.values?.compactMapNotNull { supertypesGroup ->
commonize(supertypesGroup, TypeCommonizer(classifiers))
}.orEmpty()
setSupertypes( setSupertypes(
if (supertypesMap.isNullOrEmpty()) if (commonSupertypes.isEmpty() && classId !in SPECIAL_CLASS_WITHOUT_SUPERTYPES_CIDS)
if (classId in SPECIAL_CLASS_WITHOUT_SUPERTYPES_CIDS) emptyList() else listOf(CirTypeFactory.StandardTypes.ANY) listOf(CirTypeFactory.StandardTypes.ANY)
else else
supertypesMap.values.compactMapNotNull { supertypesGroup -> commonize(supertypesGroup, TypeCommonizer(classifiers)) } commonSupertypes
) )
} }
} }