From 44893e09c13e1d5222d5ea008444a773ff85bd15 Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Thu, 15 Oct 2020 10:37:30 +0300 Subject: [PATCH] IR: remove unneeded ObsoleteDescriptorBasedAPI uses from backend.common --- .../kotlin/backend/common/TailRecursionCallsCollector.kt | 2 -- .../src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt | 2 -- .../src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt | 1 - .../kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt | 2 -- .../kotlin/backend/common/lower/LocalDeclarationsLowering.kt | 2 -- .../kotlin/backend/common/lower/inline/FunctionInlining.kt | 2 -- 6 files changed, 11 deletions(-) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/TailRecursionCallsCollector.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/TailRecursionCallsCollector.kt index ae622d5dfd1..fa1957567b5 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/TailRecursionCallsCollector.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/TailRecursionCallsCollector.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.backend.common -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrFunction @@ -35,7 +34,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * It is also not guaranteed that each returned call is detected as tail recursion by the frontend. * However any returned call can be correctly optimized as tail recursion. */ -@OptIn(ObsoleteDescriptorBasedAPI::class) fun collectTailRecursionCalls(irFunction: IrFunction): Set { if ((irFunction as? IrSimpleFunction)?.isTailrec != true) { return emptySet() diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt index 6cae37eac86..efbdfc2fe6e 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrInlineUtils.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.common.ir import org.jetbrains.kotlin.backend.common.lower.VariableRemapper import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.ir.IrStatement -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor @@ -83,7 +82,6 @@ private fun IrBody.move( // TODO use a generic inliner (e.g. JS/Native's FunctionInlining.Inliner) // Inline simple function calls without type parameters, default parameters, or varargs. -@OptIn(ObsoleteDescriptorBasedAPI::class) fun IrFunction.inline(target: IrDeclarationParent, arguments: List = listOf()): IrReturnableBlock = IrReturnableBlockImpl(startOffset, endOffset, returnType, IrReturnableBlockSymbolImpl(getNewWrappedDescriptor()), null, symbol).apply { statements += body!!.move(this@inline, target, symbol, valueParameters.zip(arguments).toMap()).statements diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt index 2d6feb1f001..d82fce54e8f 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ir/IrUtils.kt @@ -164,7 +164,6 @@ fun IrTypeParameter.copyToWithoutSuperTypes( this.index = index } -@OptIn(ObsoleteDescriptorBasedAPI::class) fun IrFunction.copyReceiverParametersFrom(from: IrFunction) { dispatchReceiverParameter = from.dispatchReceiverParameter?.run { val newDescriptor = WrappedReceiverParameterDescriptor() diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index 0237b3b1220..2108ca67410 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.DescriptorVisibility -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.* import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter @@ -539,7 +538,6 @@ private fun IrFunction.generateDefaultsFunction( return null } -@OptIn(ObsoleteDescriptorBasedAPI::class) private fun IrFunction.generateDefaultsFunctionImpl( context: CommonBackendContext, newOrigin: IrDeclarationOrigin, diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt index 8f54722d8b9..39137807638 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.descriptors.synthesizedString import org.jetbrains.kotlin.backend.common.ir.* import org.jetbrains.kotlin.backend.common.runOnFilePostfix import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.descriptors.DescriptorVisibility import org.jetbrains.kotlin.ir.* @@ -200,7 +199,6 @@ class LocalDeclarationsLowering( body.remapTypes(typeRemapper) } - @OptIn(ObsoleteDescriptorBasedAPI::class) private inner class LocalDeclarationsTransformer( val irElement: IrElement, val container: IrDeclaration, val classesToLower: Set? ) { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt index 58afdec327b..5a7071aafb7 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/inline/FunctionInlining.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.config.coroutinesIntrinsicsPackageFqName import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrStatement -import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.builders.irReturn import org.jetbrains.kotlin.ir.declarations.* @@ -77,7 +76,6 @@ open class DefaultInlineFunctionResolver(open val context: CommonBackendContext) } } -@OptIn(ObsoleteDescriptorBasedAPI::class) class FunctionInlining( val context: CommonBackendContext, val inlineFunctionResolver: InlineFunctionResolver