From a1bb44deb4ab5f21da9ddd397ae64d4757a60fa4 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 1 Sep 2020 16:07:50 +0300 Subject: [PATCH] Rename Visibility to DescriptorVisibility (cherry picked from commit 20bf850f10ee66ee65a3527bf818255d1c2f08b0) --- .../src/org/jetbrains/kotlin/backend/konan/Boxing.kt | 6 +++--- .../src/org/jetbrains/kotlin/backend/konan/Context.kt | 2 +- .../org/jetbrains/kotlin/backend/konan/EntryPoint.kt | 6 +++--- .../backend/konan/EnumSpecialDescriptorsFactory.kt | 8 ++++---- .../jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt | 10 +++++----- .../kotlin/backend/konan/cgen/CBridgeGenUtils.kt | 6 +++--- .../jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt | 4 ++-- .../konan/ir/interop/cenum/CEnumClassGenerator.kt | 6 +++--- .../jetbrains/kotlin/backend/konan/lower/Autoboxing.kt | 6 +++--- .../backend/konan/lower/CallableReferenceLowering.kt | 8 ++++---- .../kotlin/backend/konan/lower/DelegationLowering.kt | 2 +- .../backend/konan/lower/EnumConstructorsLowering.kt | 4 ++-- .../backend/konan/lower/FinallyBlocksLowering.kt | 4 ++-- .../kotlin/backend/konan/lower/InitializersLowering.kt | 2 +- .../kotlin/backend/konan/lower/InteropLowering.kt | 4 ++-- .../konan/lower/NativeSingleAbstractMethodLowering.kt | 6 +++--- .../konan/lower/NativeSuspendFunctionLowering.kt | 8 ++++---- .../kotlin/backend/konan/lower/TestProcessor.kt | 8 ++++---- .../kotlin/backend/konan/objcexport/ObjCExportLazy.kt | 2 +- .../src/org/jetbrains/kotlin/ir/util/IrUtils2.kt | 6 +++--- .../org/jetbrains/kotlin/cli/klib/KlibPrinter.kt | 4 ++-- 21 files changed, 56 insertions(+), 56 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt index 3eaa6efd57f..a6b01056bde 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Boxing.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt index 35a5e97a986..4f9b8eb8690 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/Context.kt @@ -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) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt index 8472fa0540e..282ee96fecf 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EntryPoint.kt @@ -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 -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt index b531dd608d0..12615faeb08 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/EnumSpecialDescriptorsFactory.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt index bdfd94e182d..d51c64f3f75 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGen.kt @@ -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(""), - 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 diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt index 4ea269007dd..a48d0f086bb 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/cgen/CBridgeGenUtils.kt @@ -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(')') } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt index e10c8de9a0e..ed0460ec147 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/NewIrUtils.kt @@ -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 diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt index ef35fdd8f81..af8deb815d8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/cenum/CEnumClassGenerator.kt @@ -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 } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt index dfffe9bb5be..f2736e14b33 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt @@ -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) } } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt index b2ea044e506..af0fff2250c 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CallableReferenceLowering.kt @@ -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(""), - 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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt index 56f909c1da5..d796ed79c32 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DelegationLowering.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt index fd285cc1143..b659159ab00 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt index cd9f6099ed3..3672d2e5b99 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FinallyBlocksLowering.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt index 522da3d8f27..6b74417c9a9 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InitializersLowering.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt index 015e6d0093a..18ee1357fdb 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt @@ -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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSingleAbstractMethodLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSingleAbstractMethodLowering.kt index 9c4f8f468ef..1e4f7878bb0 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSingleAbstractMethodLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSingleAbstractMethodLowering.kt @@ -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) = - 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 -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt index 1bf1cd4c803..14cb3cf9c63 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeSuspendFunctionLowering.kt @@ -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) } } -} \ No newline at end of file +} diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt index 8b03dfc151f..50e997cb531 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TestProcessor.kt @@ -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(""), - 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, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt index 12b07488a58..60efb291d24 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt @@ -262,7 +262,7 @@ internal class ObjCExportLazyImpl( parent.ownerDescriptor, Annotations.EMPTY, Modality.FINAL, - Visibilities.PUBLIC, + DescriptorVisibilities.PUBLIC, declaration.isVar, fakeName, CallableMemberDescriptor.Kind.DECLARATION, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt index cd1be9ff851..0772f394652 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/ir/util/IrUtils2.kt @@ -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, diff --git a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibPrinter.kt b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibPrinter.kt index 3242173bc6d..1becd5c8f7e 100644 --- a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibPrinter.kt +++ b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KlibPrinter.kt @@ -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) {