IR: remove unneeded ObsoleteDescriptorBasedAPI uses from backend.common
This commit is contained in:
-2
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.backend.common
|
package org.jetbrains.kotlin.backend.common
|
||||||
|
|
||||||
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
|
||||||
import org.jetbrains.kotlin.ir.IrElement
|
import org.jetbrains.kotlin.ir.IrElement
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrClass
|
import org.jetbrains.kotlin.ir.declarations.IrClass
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrFunction
|
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.
|
* 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.
|
* However any returned call can be correctly optimized as tail recursion.
|
||||||
*/
|
*/
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
fun collectTailRecursionCalls(irFunction: IrFunction): Set<IrCall> {
|
fun collectTailRecursionCalls(irFunction: IrFunction): Set<IrCall> {
|
||||||
if ((irFunction as? IrSimpleFunction)?.isTailrec != true) {
|
if ((irFunction as? IrSimpleFunction)?.isTailrec != true) {
|
||||||
return emptySet()
|
return emptySet()
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.common.ir
|
|||||||
import org.jetbrains.kotlin.backend.common.lower.VariableRemapper
|
import org.jetbrains.kotlin.backend.common.lower.VariableRemapper
|
||||||
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
||||||
import org.jetbrains.kotlin.ir.IrStatement
|
import org.jetbrains.kotlin.ir.IrStatement
|
||||||
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
|
||||||
import org.jetbrains.kotlin.ir.declarations.*
|
import org.jetbrains.kotlin.ir.declarations.*
|
||||||
import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
|
import org.jetbrains.kotlin.ir.descriptors.WrappedClassConstructorDescriptor
|
||||||
import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
|
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)
|
// TODO use a generic inliner (e.g. JS/Native's FunctionInlining.Inliner)
|
||||||
// Inline simple function calls without type parameters, default parameters, or varargs.
|
// Inline simple function calls without type parameters, default parameters, or varargs.
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
fun IrFunction.inline(target: IrDeclarationParent, arguments: List<IrValueDeclaration> = listOf()): IrReturnableBlock =
|
fun IrFunction.inline(target: IrDeclarationParent, arguments: List<IrValueDeclaration> = listOf()): IrReturnableBlock =
|
||||||
IrReturnableBlockImpl(startOffset, endOffset, returnType, IrReturnableBlockSymbolImpl(getNewWrappedDescriptor()), null, symbol).apply {
|
IrReturnableBlockImpl(startOffset, endOffset, returnType, IrReturnableBlockSymbolImpl(getNewWrappedDescriptor()), null, symbol).apply {
|
||||||
statements += body!!.move(this@inline, target, symbol, valueParameters.zip(arguments).toMap()).statements
|
statements += body!!.move(this@inline, target, symbol, valueParameters.zip(arguments).toMap()).statements
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ fun IrTypeParameter.copyToWithoutSuperTypes(
|
|||||||
this.index = index
|
this.index = index
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
fun IrFunction.copyReceiverParametersFrom(from: IrFunction) {
|
fun IrFunction.copyReceiverParametersFrom(from: IrFunction) {
|
||||||
dispatchReceiverParameter = from.dispatchReceiverParameter?.run {
|
dispatchReceiverParameter = from.dispatchReceiverParameter?.run {
|
||||||
val newDescriptor = WrappedReceiverParameterDescriptor()
|
val newDescriptor = WrappedReceiverParameterDescriptor()
|
||||||
|
|||||||
-2
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.ir.*
|
|||||||
import org.jetbrains.kotlin.descriptors.Modality
|
import org.jetbrains.kotlin.descriptors.Modality
|
||||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
||||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
|
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
|
||||||
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
|
||||||
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
|
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
|
||||||
import org.jetbrains.kotlin.ir.builders.*
|
import org.jetbrains.kotlin.ir.builders.*
|
||||||
import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
|
import org.jetbrains.kotlin.ir.builders.declarations.addValueParameter
|
||||||
@@ -539,7 +538,6 @@ private fun IrFunction.generateDefaultsFunction(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
private fun IrFunction.generateDefaultsFunctionImpl(
|
private fun IrFunction.generateDefaultsFunctionImpl(
|
||||||
context: CommonBackendContext,
|
context: CommonBackendContext,
|
||||||
newOrigin: IrDeclarationOrigin,
|
newOrigin: IrDeclarationOrigin,
|
||||||
|
|||||||
-2
@@ -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.ir.*
|
||||||
import org.jetbrains.kotlin.backend.common.runOnFilePostfix
|
import org.jetbrains.kotlin.backend.common.runOnFilePostfix
|
||||||
import org.jetbrains.kotlin.descriptors.Modality
|
import org.jetbrains.kotlin.descriptors.Modality
|
||||||
import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
|
|
||||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
||||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
|
import org.jetbrains.kotlin.descriptors.DescriptorVisibility
|
||||||
import org.jetbrains.kotlin.ir.*
|
import org.jetbrains.kotlin.ir.*
|
||||||
@@ -200,7 +199,6 @@ class LocalDeclarationsLowering(
|
|||||||
body.remapTypes(typeRemapper)
|
body.remapTypes(typeRemapper)
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
private inner class LocalDeclarationsTransformer(
|
private inner class LocalDeclarationsTransformer(
|
||||||
val irElement: IrElement, val container: IrDeclaration, val classesToLower: Set<IrClass>?
|
val irElement: IrElement, val container: IrDeclaration, val classesToLower: Set<IrClass>?
|
||||||
) {
|
) {
|
||||||
|
|||||||
-2
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.config.coroutinesIntrinsicsPackageFqName
|
|||||||
import org.jetbrains.kotlin.config.languageVersionSettings
|
import org.jetbrains.kotlin.config.languageVersionSettings
|
||||||
import org.jetbrains.kotlin.ir.IrElement
|
import org.jetbrains.kotlin.ir.IrElement
|
||||||
import org.jetbrains.kotlin.ir.IrStatement
|
import org.jetbrains.kotlin.ir.IrStatement
|
||||||
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
|
|
||||||
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
|
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
|
||||||
import org.jetbrains.kotlin.ir.builders.irReturn
|
import org.jetbrains.kotlin.ir.builders.irReturn
|
||||||
import org.jetbrains.kotlin.ir.declarations.*
|
import org.jetbrains.kotlin.ir.declarations.*
|
||||||
@@ -77,7 +76,6 @@ open class DefaultInlineFunctionResolver(open val context: CommonBackendContext)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ObsoleteDescriptorBasedAPI::class)
|
|
||||||
class FunctionInlining(
|
class FunctionInlining(
|
||||||
val context: CommonBackendContext,
|
val context: CommonBackendContext,
|
||||||
val inlineFunctionResolver: InlineFunctionResolver
|
val inlineFunctionResolver: InlineFunctionResolver
|
||||||
|
|||||||
Reference in New Issue
Block a user