Rename Visibility to DescriptorVisibility

(cherry picked from commit 20bf850f10ee66ee65a3527bf818255d1c2f08b0)
2020-09-01 16:07:50 +03:00
parent 26bec6f739
commit a1bb44deb4
21 changed files with 56 additions and 56 deletions
@@ -9,7 +9,7 @@ import llvm.*
 import org.jetbrains.kotlin.backend.konan.ir.KonanSymbols
 import org.jetbrains.kotlin.backend.konan.llvm.*
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrValueParameterImpl
@@ -65,7 +65,7 @@ internal val Context.getBoxFunction: (IrClass) -> IrSimpleFunction by Context.la
            DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION,
            IrSimpleFunctionSymbolImpl(descriptor),
            Name.special("<${inlinedClass.name}-box>"),
-            Visibilities.PUBLIC,
+            DescriptorVisibilities.PUBLIC,
            Modality.FINAL,
            returnType,
            isInline = false,
@@ -120,7 +120,7 @@ internal val Context.getUnboxFunction: (IrClass) -> IrSimpleFunction by Context.
            DECLARATION_ORIGIN_INLINE_CLASS_SPECIAL_FUNCTION,
            IrSimpleFunctionSymbolImpl(descriptor),
            Name.special("<${inlinedClass.name}-unbox>"),
-            Visibilities.PUBLIC,
+            DescriptorVisibilities.PUBLIC,
            Modality.FINAL,
            returnType,
            isInline = false,
@@ -83,7 +83,7 @@ internal class SpecialDeclarationsFactory(val context: Context) {
            )
            val descriptor = PropertyDescriptorImpl.create(
                    innerClass.descriptor, Annotations.EMPTY, Modality.FINAL,
-                    Visibilities.PRIVATE, false, "this$0".synthesizedName, CallableMemberDescriptor.Kind.SYNTHESIZED,
+                    DescriptorVisibilities.PRIVATE, false, "this$0".synthesizedName, CallableMemberDescriptor.Kind.SYNTHESIZED,
                    SourceElement.NO_SOURCE, false, false, false, false, false, false
            ).apply {
                this.setType(outerClass.descriptor.defaultType, emptyList(), receiver, null)
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
 import org.jetbrains.kotlin.backend.common.lower.irBlockBody
 import org.jetbrains.kotlin.backend.konan.ir.buildSimpleAnnotation
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrFunction
@@ -33,7 +33,7 @@ internal fun makeEntryPoint(context: Context): IrFunction {
            IrDeclarationOrigin.DEFINED,
            IrSimpleFunctionSymbolImpl(entryPointDescriptor),
            Name.identifier("Konan_start"),
-            Visibilities.PRIVATE,
+            DescriptorVisibilities.PRIVATE,
            Modality.FINAL,
            context.irBuiltIns.intType,
            isInline = false,
@@ -93,4 +93,4 @@ internal fun makeEntryPoint(context: Context): IrFunction {
    }

    return entryPoint
-}
+}
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.ir.createParameterDeclarations
 import org.jetbrains.kotlin.backend.konan.descriptors.synthesizedName
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
 import org.jetbrains.kotlin.ir.declarations.impl.IrFieldImpl
@@ -50,7 +50,7 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                    IrClassSymbolImpl(it),
                    "OBJECT".synthesizedName,
                    ClassKind.OBJECT,
-                    Visibilities.PUBLIC,
+                    DescriptorVisibilities.PUBLIC,
                    Modality.FINAL,
                    isCompanion = false,
                    isInner = false,
@@ -74,7 +74,7 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                    IrFieldSymbolImpl(it),
                    "VALUES".synthesizedName,
                    valuesType,
-                    Visibilities.PRIVATE,
+                    DescriptorVisibilities.PRIVATE,
                    isFinal = true,
                    isExternal = false,
                    isStatic = false,
@@ -90,7 +90,7 @@ internal class EnumSpecialDeclarationsFactory(val context: Context) {
                    DECLARATION_ORIGIN_ENUM,
                    IrSimpleFunctionSymbolImpl(it),
                    "get-VALUES".synthesizedName,
-                    Visibilities.PUBLIC,
+                    DescriptorVisibilities.PUBLIC,
                    Modality.FINAL,
                    valuesType,
                    isInline = false,
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.UnsignedType
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -568,7 +568,7 @@ private fun KotlinStubs.createFakeKotlinExternalFunction(
            IrDeclarationOrigin.DEFINED,
            IrSimpleFunctionSymbolImpl(bridgeDescriptor),
            Name.identifier(cFunctionName),
-            Visibilities.PRIVATE,
+            DescriptorVisibilities.PRIVATE,
            Modality.FINAL,
            signature.returnType,
            isInline = false,
@@ -1217,7 +1217,7 @@ private class ObjCBlockPointerValuePassing(
                startOffset, endOffset,
                OBJC_BLOCK_FUNCTION_IMPL, IrClassSymbolImpl(classDescriptor),
                Name.identifier(stubs.getUniqueKotlinFunctionReferenceClassName("BlockFunctionImpl")),
-                ClassKind.CLASS, Visibilities.PRIVATE, Modality.FINAL,
+                ClassKind.CLASS, DescriptorVisibilities.PRIVATE, Modality.FINAL,
                isCompanion = false, isInner = false, isData = false, isExternal = false,
                isInline = false, isExpect = false, isFun = false
        )
@@ -1241,7 +1241,7 @@ private class ObjCBlockPointerValuePassing(
                OBJC_BLOCK_FUNCTION_IMPL,
                IrConstructorSymbolImpl(constructorDescriptor),
                Name.special("<init>"),
-                Visibilities.PUBLIC,
+                DescriptorVisibilities.PUBLIC,
                irClass.defaultType,
                isInline = false, isExternal = false, isPrimary = true, isExpect = false
        )
@@ -1282,7 +1282,7 @@ private class ObjCBlockPointerValuePassing(
                OBJC_BLOCK_FUNCTION_IMPL,
                IrSimpleFunctionSymbolImpl(invokeMethodDescriptor),
                overriddenInvokeMethod.name,
-                Visibilities.PUBLIC, Modality.FINAL,
+                DescriptorVisibilities.PUBLIC, Modality.FINAL,
                returnType = functionType.arguments.last().typeOrNull!!,
                isInline = false, isExternal = false, isTailrec = false, isSuspend = false, isExpect = false,
                isFakeOverride = false, isOperator = false, isInfix = false
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.backend.common.lower.irThrow
 import org.jetbrains.kotlin.backend.konan.ir.KonanSymbols
 import org.jetbrains.kotlin.backend.konan.ir.buildSimpleAnnotation
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
@@ -114,7 +114,7 @@ private fun createKotlinBridge(
            IrDeclarationOrigin.DEFINED,
            IrSimpleFunctionSymbolImpl(bridgeDescriptor),
            Name.identifier(cBridgeName),
-            Visibilities.PRIVATE,
+            DescriptorVisibilities.PRIVATE,
            Modality.FINAL,
            IrUninitializedType,
            isInline = false,
@@ -245,4 +245,4 @@ internal class CCallBuilder {
        arguments.joinTo(this)
        append(')')
    }
-}
+}
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.atMostOne
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
 import org.jetbrains.kotlin.ir.expressions.IrConst
@@ -55,7 +55,7 @@ val IrProperty.isReal: Boolean get() = this.descriptor.kind.isReal
 val IrField.isReal: Boolean get() = this.descriptor.kind.isReal

 val IrSimpleFunction.isOverridable: Boolean
-    get() = visibility != Visibilities.PRIVATE
+    get() = visibility != DescriptorVisibilities.PRIVATE
            && modality != Modality.FINAL
            && (parent as? IrClass)?.isFinalClass != true

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.konan.ir.interop.irInstanceInitializer
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
@@ -95,7 +95,7 @@ internal class CEnumClassGenerator(
        symbolTable.withScope(propertyDescriptor) {
            irProperty.backingField = symbolTable.declareField(
                    SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.PROPERTY_BACKING_FIELD,
-                    propertyDescriptor, propertyDescriptor.type.toIrType(), Visibilities.PRIVATE
+                    propertyDescriptor, propertyDescriptor.type.toIrType(), DescriptorVisibilities.PRIVATE
            ).also {
                it.initializer = irBuilder(irBuiltIns, it.symbol, SYNTHETIC_OFFSET, SYNTHETIC_OFFSET).run {
                    irExprBody(irGet(irClass.primaryConstructor!!.valueParameters[0]))
@@ -159,4 +159,4 @@ internal class CEnumClassGenerator(
        }
        return irConstructor
    }
-}
+}
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.konan.*
 import org.jetbrains.kotlin.backend.konan.ir.*
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.*
@@ -397,7 +397,7 @@ private class InlineClassTransformer(private val context: Context) : IrBuildingT
                IrFieldSymbolImpl(descriptor),
                Name.identifier("value"),
                declaration.defaultType,
-                Visibilities.PRIVATE,
+                DescriptorVisibilities.PRIVATE,
                isFinal = true,
                isExternal = false,
                isStatic = false,
@@ -516,4 +516,4 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl
        parent = irConstructor.parent
        valueParameters += irConstructor.valueParameters.map { it.copyTo(this) }
    }
-}
+}
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.backend.konan.llvm.functionName
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
@@ -166,7 +166,7 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
                    IrClassSymbolImpl(it),
                    "${referencedFunction.name}\$FUNCTION_REFERENCE\$${context.functionReferenceCount++}".synthesizedName,
                    ClassKind.CLASS,
-                    Visibilities.PRIVATE,
+                    DescriptorVisibilities.PRIVATE,
                    Modality.FINAL,
                    isCompanion = false,
                    isInner = false,
@@ -260,7 +260,7 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
                    DECLARATION_ORIGIN_FUNCTION_REFERENCE_IMPL,
                    IrConstructorSymbolImpl(it),
                    Name.special("<init>"),
-                    Visibilities.PUBLIC,
+                    DescriptorVisibilities.PUBLIC,
                    functionReferenceClass.defaultType,
                    isInline = false,
                    isExternal = false,
@@ -312,7 +312,7 @@ internal class CallableReferenceLowering(val context: Context): FileLoweringPass
                    DECLARATION_ORIGIN_FUNCTION_REFERENCE_IMPL,
                    IrSimpleFunctionSymbolImpl(it),
                    superFunction.name,
-                    Visibilities.PRIVATE,
+                    DescriptorVisibilities.PRIVATE,
                    Modality.FINAL,
                    referencedFunction.returnType,
                    isInline = false,
@@ -93,7 +93,7 @@ internal class PropertyDelegationLowering(val context: Context) : FileLoweringPa
                    IrFieldSymbolImpl(it),
                    "KPROPERTIES".synthesizedName,
                    kPropertiesFieldType,
-                    Visibilities.PRIVATE,
+                    DescriptorVisibilities.PRIVATE,
                    isFinal = true,
                    isExternal = false,
                    isStatic = true,
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.backend.common.runOnFilePostfix
 import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.backend.konan.DECLARATION_ORIGIN_ENUM
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrConstructorImpl
@@ -115,7 +115,7 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas
                        constructor.origin,
                        IrConstructorSymbolImpl(it),
                        constructor.name,
-                        Visibilities.PROTECTED,
+                        DescriptorVisibilities.PROTECTED,
                        constructor.returnType,
                        isInline = false,
                        isExternal = false,
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.backend.common.*
 import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
@@ -180,7 +180,7 @@ internal class FinallyBlocksLowering(val context: Context): FileLoweringPass, Ir
                IrDeclarationOrigin.DEFINED,
                IrSimpleFunctionSymbolImpl(descriptor),
                Name.identifier(name),
-                Visibilities.PUBLIC,
+                DescriptorVisibilities.PUBLIC,
                Modality.FINAL,
                context.irBuiltIns.unitType,
                false,
@@ -112,7 +112,7 @@ internal class InitializersLowering(val context: CommonBackendContext) : ClassLo
                        DECLARATION_ORIGIN_ANONYMOUS_INITIALIZER,
                        IrSimpleFunctionSymbolImpl(it),
                        "INITIALIZER".synthesizedName,
-                        Visibilities.PRIVATE,
+                        DescriptorVisibilities.PRIVATE,
                        Modality.FINAL,
                        context.irBuiltIns.unitType,
                        isInline = false,
@@ -249,7 +249,7 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
                OVERRIDING_INITIALIZER_BY_CONSTRUCTOR,
                IrSimpleFunctionSymbolImpl(resultDescriptor),
                initMethod.name,
-                Visibilities.PUBLIC,
+                DescriptorVisibilities.PUBLIC,
                Modality.OPEN,
                irClass.defaultType,
                isInline = false,
@@ -394,7 +394,7 @@ private class InteropLoweringPart1(val context: Context) : BaseInteropIrTransfor
                    IrDeclarationOrigin.DEFINED,
                    IrSimpleFunctionSymbolImpl(it),
                    ("imp:$selector").synthesizedName,
-                    Visibilities.PRIVATE,
+                    DescriptorVisibilities.PRIVATE,
                    Modality.FINAL,
                    returnType,
                    isInline = false,
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.konan.lower
 import org.jetbrains.kotlin.backend.common.ScopeWithIr
 import org.jetbrains.kotlin.backend.common.lower.SingleAbstractMethodLowering
 import org.jetbrains.kotlin.backend.konan.Context
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.classOrNull
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.ir.util.render

 internal class NativeSingleAbstractMethodLowering(context: Context) : SingleAbstractMethodLowering(context) {
    override fun getWrapperVisibility(expression: IrTypeOperatorCall, scopes: List<ScopeWithIr>) =
-            Visibilities.PRIVATE
+            DescriptorVisibilities.PRIVATE

    override fun getSuperTypeForWrapper(typeOperand: IrType): IrType {
        return typeOperand.classOrNull?.defaultType ?: error("Unsupported SAM conversion: ${typeOperand.render()}")
@@ -25,4 +25,4 @@ internal class NativeSingleAbstractMethodLowering(context: Context) : SingleAbst

    override val IrType.needEqualsHashCodeMethods: Boolean
        get() = false
-}
+}
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.backend.common.ir.simpleFunctions
 import org.jetbrains.kotlin.backend.common.lower.*
 import org.jetbrains.kotlin.backend.konan.Context
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.builders.*
@@ -481,7 +481,7 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
                IrDeclarationOrigin.DEFINED,
                IrSimpleFunctionSymbolImpl(it),
                "saveState".synthesizedName,
-                Visibilities.PRIVATE,
+                DescriptorVisibilities.PRIVATE,
                Modality.ABSTRACT,
                context.irBuiltIns.unitType,
                isInline = false,
@@ -503,7 +503,7 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
                IrDeclarationOrigin.DEFINED,
                IrSimpleFunctionSymbolImpl(it),
                "restoreState".synthesizedName,
-                Visibilities.PRIVATE,
+                DescriptorVisibilities.PRIVATE,
                Modality.ABSTRACT,
                context.irBuiltIns.unitType,
                isInline = false,
@@ -557,4 +557,4 @@ internal class NativeSuspendFunctionsLowering(ctx: Context): AbstractSuspendFunc
            putValueArgument(0, value)
        }
    }
-}
+}
@@ -341,7 +341,7 @@ internal class TestProcessor (val context: Context) {
                TEST_SUITE_GENERATED_MEMBER,
                IrSimpleFunctionSymbolImpl(descriptor),
                getterName,
-                Visibilities.PROTECTED,
+                DescriptorVisibilities.PROTECTED,
                Modality.FINAL,
                objectSymbol.typeWithStarProjections,
                isInline = false,
@@ -381,7 +381,7 @@ internal class TestProcessor (val context: Context) {
                TEST_SUITE_GENERATED_MEMBER,
                IrSimpleFunctionSymbolImpl(descriptor),
                getterName,
-                Visibilities.PROTECTED,
+                DescriptorVisibilities.PROTECTED,
                Modality.FINAL,
                classSymbol.typeWithStarProjections,
                isInline = false,
@@ -432,7 +432,7 @@ internal class TestProcessor (val context: Context) {
                TEST_SUITE_GENERATED_MEMBER,
                IrConstructorSymbolImpl(descriptor),
                Name.special("<init>"),
-                Visibilities.PUBLIC,
+                DescriptorVisibilities.PUBLIC,
                testSuite.typeWithStarProjections,
                isInline = false,
                isExternal = false,
@@ -486,7 +486,7 @@ internal class TestProcessor (val context: Context) {
                IrClassSymbolImpl(descriptor),
                testClass.name.synthesizeSuiteClassName(),
                ClassKind.CLASS,
-                Visibilities.PRIVATE,
+                DescriptorVisibilities.PRIVATE,
                Modality.FINAL,
                isCompanion = false,
                isInner = false,
@@ -262,7 +262,7 @@ internal class ObjCExportLazyImpl(
                        parent.ownerDescriptor,
                        Annotations.EMPTY,
                        Modality.FINAL,
-                        Visibilities.PUBLIC,
+                        DescriptorVisibilities.PUBLIC,
                        declaration.isVar,
                        fakeName,
                        CallableMemberDescriptor.Kind.DECLARATION,
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.backend.konan.ir.buildSimpleAnnotation
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.ParameterDescriptor
-import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.SourceManager
@@ -76,7 +76,7 @@ internal fun IrFile.addTopLevelInitializer(expression: IrExpression, context: Ko
            IrFieldSymbolImpl(descriptor),
            "topLevelInitializer${topLevelInitializersCounter++}".synthesizedName,
            expression.type,
-            Visibilities.PRIVATE,
+            DescriptorVisibilities.PRIVATE,
            isFinal = true,
            isExternal = false,
            isStatic = true,
@@ -352,7 +352,7 @@ fun createField(
            IrFieldSymbolImpl(it),
            name,
            type,
-            Visibilities.PRIVATE,
+            DescriptorVisibilities.PRIVATE,
            !isMutable,
            false,
            false,
@@ -18,7 +18,7 @@ class KlibPrinter(out: Appendable) {
    val printer = Printer(out, 1, "    ")

    val DeclarationDescriptorWithVisibility.isPublicOrProtected: Boolean
-        get() = visibility == Visibilities.PUBLIC || visibility == Visibilities.PROTECTED
+        get() = visibility == DescriptorVisibilities.PUBLIC || visibility == DescriptorVisibilities.PROTECTED

    val CallableMemberDescriptor.isFakeOverride: Boolean
        get() = kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE
@@ -62,7 +62,7 @@ class KlibPrinter(out: Appendable) {
        annotations.forEach {
            append(Renderers.DEFAULT.renderAnnotation(it)).append(" ")
        }
-        if (visibility != Visibilities.DEFAULT_VISIBILITY) {
+        if (visibility != DescriptorVisibilities.DEFAULT_VISIBILITY) {
            append(visibility.internalDisplayName).append(" ")
        }
        when (this@render) {