diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/TypeTranslatorImpl.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/TypeTranslatorImpl.kt index 00b2b19e68b..3bd5ef48ac0 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/TypeTranslatorImpl.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/TypeTranslatorImpl.kt @@ -44,7 +44,7 @@ class TypeTranslatorImpl( CommonSupertypes.commonSupertype(types) override fun isTypeAliasAccessibleHere(typeAliasDescriptor: TypeAliasDescriptor): Boolean { - if (typeAliasDescriptor.visibility != DescriptorVisibilities.PRIVATE) return true + if (!DescriptorVisibilities.isPrivate(typeAliasDescriptor.visibility)) return true val psiFile = typeAliasDescriptor.source.getPsi()?.containingFile ?: return false diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt index fd2b42bd548..f79a7670378 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/TypeTranslator.kt @@ -168,9 +168,7 @@ abstract class TypeTranslator( private fun SimpleType.toIrTypeAbbreviation(): IrTypeAbbreviation? { // Abbreviated type's classifier might not be TypeAliasDescriptor in case it's MockClassDescriptor (not found in dependencies). - val typeAliasDescriptor = constructor.declarationDescriptor.let { - it as? TypeAliasDescriptor - } ?: return null + val typeAliasDescriptor = constructor.declarationDescriptor as? TypeAliasDescriptor ?: return null if (!isTypeAliasAccessibleHere(typeAliasDescriptor)) return null diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt index 10b1f44ec73..33342eaf3a1 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ManglerChecker.kt @@ -33,8 +33,7 @@ class ManglerChecker(vararg _manglers: KotlinMangler) : IrElement if (declaration.parent is IrPackageFragment) { val vis = declaration as IrDeclarationWithVisibility - if (vis.visibility == DescriptorVisibilities.PRIVATE) return true - else return false + return DescriptorVisibilities.isPrivate(vis.visibility) } return declaration.parent.accept(this, data)