From 18a5b3b518f483543863c41a8b4d965f86c79065 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 7 Jul 2022 11:48:47 +0200 Subject: [PATCH] Drop unnecessary usages of OptIn(ObsoleteDescriptorBasedAPI) --- .../src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt | 1 - .../kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt | 1 - .../jetbrains/kotlin/backend/jvm/lower/ReflectiveAccess.kt | 2 -- .../src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt | 1 - .../psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt | 4 ---- .../jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt | 1 - .../jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt | 2 -- .../jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt | 2 +- .../src/org/jetbrains/kotlin/ir/backend/js/klib.kt | 4 ---- 9 files changed, 1 insertion(+), 17 deletions(-) diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt index d1d10de4f0b..861c2983928 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/lazy/Fir2IrLazyProperty.kt @@ -103,7 +103,6 @@ class Fir2IrLazyProperty( } } - @OptIn(ObsoleteDescriptorBasedAPI::class) override var backingField: IrField? by lazyVar(lock) { // TODO: this checks are very preliminary, FIR resolve should determine backing field presence itself val parent = parent diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt index e61663e7531..f7c460392fe 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/IrSourceCompilerForInline.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.incremental.components.Position import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrFunction -import org.jetbrains.kotlin.ir.declarations.name import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression import org.jetbrains.kotlin.ir.expressions.IrLoop diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReflectiveAccess.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReflectiveAccess.kt index b1e9bcfd652..1cde05f3b5e 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReflectiveAccess.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ReflectiveAccess.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.defaultArgumentCleanerPhase import org.jetbrains.kotlin.backend.jvm.ir.* import org.jetbrains.kotlin.backend.jvm.lower.SyntheticAccessorLowering.Companion.isAccessible -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.declarations.* @@ -82,7 +81,6 @@ internal class ReflectiveAccessLowering( // `fieldLocationAndReceiver`. val callsOnCompanionObjects: MutableMap = mutableMapOf() - @OptIn(ObsoleteDescriptorBasedAPI::class) private fun recordCompanionObjectAsDispatchReceiver(expression: IrCall) { val dispatchReceiver = expression.dispatchReceiver as? IrGetField ?: return val dispatchReceiverType = dispatchReceiver.symbol.owner.type as? IrSimpleType ?: return diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt index bd363a3cea5..d15d485a0c7 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/JvmIrUtils.kt @@ -67,7 +67,6 @@ import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.multiplatform.OptionalAnnotationUtil import org.jetbrains.kotlin.resolve.source.PsiSourceElement import org.jetbrains.kotlin.utils.DFS -import org.jetbrains.kotlin.utils.addToStdlib.safeAs import java.io.File import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.org.objectweb.asm.commons.Method diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt index a7d96334d13..f4ae9a90734 100644 --- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt +++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/descriptors/IrDescriptorBasedFunctionFactory.kt @@ -458,21 +458,17 @@ private fun reflectFunctionClassFqn(shortName: Name): FqName = KOTLIN_REFLECT_FQ private fun reflectionFunctionClassName(isSuspend: Boolean, arity: Int): Name = Name.identifier("K${if (isSuspend) "Suspend" else ""}Function$arity") -@OptIn(ObsoleteDescriptorBasedAPI::class) fun KotlinBuiltIns.functionClassDescriptor(arity: Int): FunctionClassDescriptor = getFunction(arity) as FunctionClassDescriptor -@OptIn(ObsoleteDescriptorBasedAPI::class) fun KotlinBuiltIns.suspendFunctionClassDescriptor(arity: Int): FunctionClassDescriptor = getSuspendFunction(arity) as FunctionClassDescriptor -@OptIn(ObsoleteDescriptorBasedAPI::class) fun KotlinBuiltIns.kFunctionClassDescriptor(arity: Int): FunctionClassDescriptor { val kFunctionFqn = reflectFunctionClassFqn(reflectionFunctionClassName(false, arity)) return getBuiltInClassByFqName(kFunctionFqn) as FunctionClassDescriptor } -@OptIn(ObsoleteDescriptorBasedAPI::class) fun KotlinBuiltIns.kSuspendFunctionClassDescriptor(arity: Int): FunctionClassDescriptor { val kFunctionFqn = reflectFunctionClassFqn(reflectionFunctionClassName(true, arity)) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt index caadd1102b7..63cf7bcb8b5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFunctionImpl.kt @@ -134,7 +134,6 @@ class IrFakeOverrideFunctionImpl( override val descriptor get() = _symbol?.descriptor ?: this.toIrBasedDescriptor() - @OptIn(ObsoleteDescriptorBasedAPI::class) override fun acquireSymbol(symbol: IrSimpleFunctionSymbol): IrSimpleFunction { assert(_symbol == null) { "$this already has symbol _symbol" } _symbol = symbol diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt index 3ba7ba6fc37..67d73f6b8d6 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrPropertyImpl.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.toIrBasedDescriptor import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.symbols.IrPropertySymbol -import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource @@ -108,7 +107,6 @@ class IrFakeOverridePropertyImpl( override val descriptor get() = _symbol?.descriptor ?: this.toIrBasedDescriptor() - @OptIn(ObsoleteDescriptorBasedAPI::class) override fun acquireSymbol(symbol: IrPropertySymbol): IrProperty { assert(_symbol == null) { "$this already has symbol _symbol" } _symbol = symbol diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt index c5e92c598f8..ef9c8d3d37a 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrPublicSymbolBase.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.util.IdSignature import org.jetbrains.kotlin.ir.util.render -abstract class IrPublicSymbolBase @OptIn(ObsoleteDescriptorBasedAPI::class) constructor( +abstract class IrPublicSymbolBase constructor( override val signature: IdSignature, private val _descriptor: D? ) : IrSymbol { diff --git a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt index a0a671a26cf..0c2022ae738 100644 --- a/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt +++ b/compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/klib.kt @@ -37,7 +37,6 @@ import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl import org.jetbrains.kotlin.ir.descriptors.IrDescriptorBasedFunctionFactory import org.jetbrains.kotlin.ir.linkage.IrDeserializer -import org.jetbrains.kotlin.ir.linkage.IrProvider import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.ir.visitors.acceptVoid @@ -58,7 +57,6 @@ import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration import org.jetbrains.kotlin.psi2ir.Psi2IrTranslator import org.jetbrains.kotlin.psi2ir.descriptors.IrBuiltInsOverDescriptors import org.jetbrains.kotlin.psi2ir.generators.DeclarationStubGeneratorImpl -import org.jetbrains.kotlin.psi2ir.generators.DeclarationStubGeneratorForNotFoundClasses import org.jetbrains.kotlin.psi2ir.generators.GeneratorContext import org.jetbrains.kotlin.psi2ir.generators.TypeTranslatorImpl import org.jetbrains.kotlin.resolve.BindingContext @@ -68,7 +66,6 @@ import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.util.DummyLogger import org.jetbrains.kotlin.util.Logger import org.jetbrains.kotlin.utils.DFS -import org.jetbrains.kotlin.utils.addToStdlib.runIf import java.io.File val KotlinLibrary.moduleName: String @@ -302,7 +299,6 @@ fun getFunctionFactoryCallback(stdlibModule: IrModuleFragment) = { packageFragme ).also { stdlibModule.files += it } } -@OptIn(ObsoleteDescriptorBasedAPI::class) fun loadIr( depsDescriptors: ModulesStructure, irFactory: IrFactory,