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 70b36a71d82..2d42769145f 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 @@ -127,31 +127,6 @@ fun IrInlinable.inline(target: IrDeclarationParent, arguments: List element - is IrFunctionExpression -> element.function - is IrFunctionReference -> element.symbol.owner - is IrPropertyReference -> element.symbol.owner - else -> throw AssertionError("Not supported ir element for inlining ${element.dump()}") - } - -private val IrInlinedFunctionBlock.inlineFunction: IrFunction? - get() = when (val element = inlinedElement) { - is IrFunction -> element - is IrFunctionExpression -> element.function - is IrFunctionReference -> element.symbol.owner.takeIf { it.isInline } - else -> null - } - -fun IrInlinedFunctionBlock.isFunctionInlining(): Boolean { - return this.inlinedElement is IrFunction -} - -fun IrInlinedFunctionBlock.isLambdaInlining(): Boolean { - return !isFunctionInlining() -} - fun IrInlinedFunctionBlock.getAdditionalStatementsFromInlinedBlock(): List { return this.statements .filterIsInstance() @@ -198,11 +173,3 @@ fun IrInlinedFunctionBlock.putStatementsInFrontOfInlinedFunction(statements: Lis this.statements.addAll(if (insertAfter == -1) 0 else insertAfter + 1, statements) } -val IrContainerExpression.innerInlinedBlockOrThis: IrContainerExpression - get() = (this as? IrReturnableBlock)?.statements?.singleOrNull() as? IrInlinedFunctionBlock ?: this - -val IrReturnableBlock.inlineFunction: IrFunction? - get() = (this.statements.singleOrNull() as? IrInlinedFunctionBlock)?.inlineFunction - -val IrReturnableBlock.sourceFileSymbol: IrFileSymbol? - get() = inlineFunction?.fileOrNull?.symbol 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 53c8bb3b7de..db440eb6c35 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 @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.types.isUnit import org.jetbrains.kotlin.ir.types.typeWith import org.jetbrains.kotlin.ir.util.dump +import org.jetbrains.kotlin.ir.util.inlineFunction import org.jetbrains.kotlin.ir.util.statements fun IrReturnTarget.returnType(context: CommonBackendContext) = diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractValueUsageTransformer.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractValueUsageTransformer.kt index e2fa62bf635..13b081cb653 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractValueUsageTransformer.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/AbstractValueUsageTransformer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.backend.common.lower -import org.jetbrains.kotlin.backend.common.ir.innerInlinedBlockOrThis +import org.jetbrains.kotlin.ir.util.innerInlinedBlockOrThis import org.jetbrains.kotlin.ir.IrBuiltIns import org.jetbrains.kotlin.ir.IrStatement import org.jetbrains.kotlin.ir.declarations.* diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InventNamesForLocalClasses.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InventNamesForLocalClasses.kt index 7282fd51b13..a8decffd747 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InventNamesForLocalClasses.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InventNamesForLocalClasses.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.ir.getAdditionalStatementsFromInlinedBlock import org.jetbrains.kotlin.backend.common.ir.getNonDefaultAdditionalStatementsFromInlinedBlock import org.jetbrains.kotlin.backend.common.ir.getOriginalStatementsFromInlinedBlock -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.* 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 15bb1be25d3..89bddbfbd95 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 @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.lower import org.jetbrains.kotlin.backend.common.BodyLoweringPass import org.jetbrains.kotlin.backend.common.CommonBackendContext import org.jetbrains.kotlin.backend.common.descriptors.synthesizedString -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.common.lower.inline.isInlineParameter import org.jetbrains.kotlin.backend.common.runOnFilePostfix import org.jetbrains.kotlin.descriptors.DescriptorVisibilities diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt index ae040ebdc7f..b723364f144 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.ir.backend.js.dce -import org.jetbrains.kotlin.backend.common.ir.inlineFunction +import org.jetbrains.kotlin.ir.util.inlineFunction import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext import org.jetbrains.kotlin.ir.backend.js.utils.hasJsPolyfill diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt index 366be417dfa..010ee89e806 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs -import org.jetbrains.kotlin.backend.common.ir.inlineFunction -import org.jetbrains.kotlin.backend.common.ir.innerInlinedBlockOrThis +import org.jetbrains.kotlin.ir.util.inlineFunction +import org.jetbrains.kotlin.ir.util.innerInlinedBlockOrThis import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder import org.jetbrains.kotlin.ir.backend.js.utils.JsGenerationContext import org.jetbrains.kotlin.ir.backend.js.utils.emptyScope diff --git a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/LineNumberMapper.kt b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/LineNumberMapper.kt index 43c5484603b..d02f1f99c75 100644 --- a/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/LineNumberMapper.kt +++ b/compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/LineNumberMapper.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.backend.jvm.codegen -import org.jetbrains.kotlin.backend.common.ir.inlineDeclaration -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining -import org.jetbrains.kotlin.backend.common.ir.isLambdaInlining +import org.jetbrains.kotlin.ir.util.inlineDeclaration +import org.jetbrains.kotlin.ir.util.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isLambdaInlining import org.jetbrains.kotlin.backend.common.lower.inline.isAdaptedFunctionReference import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.fileParentBeforeInline diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/CreateSeparateCallForInlinedLambdasLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/CreateSeparateCallForInlinedLambdasLowering.kt index 90198b7b902..6cc55351864 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/CreateSeparateCallForInlinedLambdasLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/CreateSeparateCallForInlinedLambdasLowering.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.ir.getAdditionalStatementsFromInlinedBlock -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.common.ir.putStatementBeforeActualInline import org.jetbrains.kotlin.backend.common.phaser.makeIrModulePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FakeInliningLocalVariablesAfterInlineLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FakeInliningLocalVariablesAfterInlineLowering.kt index 2787aeb7588..97448c87c18 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FakeInliningLocalVariablesAfterInlineLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/FakeInliningLocalVariablesAfterInlineLowering.kt @@ -20,6 +20,9 @@ import org.jetbrains.kotlin.ir.builders.irInt import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrBlock import org.jetbrains.kotlin.ir.expressions.IrInlinedFunctionBlock +import org.jetbrains.kotlin.ir.util.inlineDeclaration +import org.jetbrains.kotlin.ir.util.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isLambdaInlining import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/MarkNecessaryInlinedClassesAsRegeneratedLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/MarkNecessaryInlinedClassesAsRegeneratedLowering.kt index 26147172fe3..40f6f67b2d8 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/MarkNecessaryInlinedClassesAsRegeneratedLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/MarkNecessaryInlinedClassesAsRegeneratedLowering.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.backend.common.ir.inlineDeclaration -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.inlineDeclaration +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.common.lower.inline.INLINED_FUNCTION_REFERENCE import org.jetbrains.kotlin.backend.common.phaser.makeIrModulePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt index 9084c97298c..9de358cdbbe 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext import org.jetbrains.kotlin.backend.common.ScopeWithIr -import org.jetbrains.kotlin.backend.common.ir.inlineDeclaration -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.inlineDeclaration +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.backend.jvm.ir.IrInlineScopeResolver import org.jetbrains.kotlin.backend.jvm.ir.findInlineCallSites diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt index d3ddc63d022..aee5a863515 100644 --- a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt +++ b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/TailCallOptimizationLowering.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.ir.IrStatement diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrInlineReferenceLocator.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrInlineReferenceLocator.kt index d600b0d1e09..5d873ce144e 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrInlineReferenceLocator.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/ir/IrInlineReferenceLocator.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.backend.jvm.ir -import org.jetbrains.kotlin.backend.common.ir.inlineDeclaration -import org.jetbrains.kotlin.backend.common.ir.isFunctionInlining +import org.jetbrains.kotlin.ir.util.inlineDeclaration +import org.jetbrains.kotlin.ir.util.isFunctionInlining import org.jetbrains.kotlin.backend.jvm.JvmBackendContext import org.jetbrains.kotlin.descriptors.DescriptorVisibilities import org.jetbrains.kotlin.ir.IrElement diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrInlineUtils.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrInlineUtils.kt new file mode 100644 index 00000000000..648565d4d8d --- /dev/null +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrInlineUtils.kt @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.ir.util + +import org.jetbrains.kotlin.ir.declarations.IrDeclaration +import org.jetbrains.kotlin.ir.declarations.IrFunction +import org.jetbrains.kotlin.ir.expressions.* +import org.jetbrains.kotlin.ir.symbols.IrFileSymbol + +val IrInlinedFunctionBlock.inlineDeclaration: IrDeclaration + get() = when (val element = inlinedElement) { + is IrFunction -> element + is IrFunctionExpression -> element.function + is IrFunctionReference -> element.symbol.owner + is IrPropertyReference -> element.symbol.owner + else -> throw AssertionError("Not supported ir element for inlining ${element.dump()}") + } +private val IrInlinedFunctionBlock.inlineFunction: IrFunction? + get() = when (val element = inlinedElement) { + is IrFunction -> element + is IrFunctionExpression -> element.function + is IrFunctionReference -> element.symbol.owner.takeIf { it.isInline } + else -> null + } + +fun IrInlinedFunctionBlock.isFunctionInlining(): Boolean { + return this.inlinedElement is IrFunction +} + +fun IrInlinedFunctionBlock.isLambdaInlining(): Boolean { + return !isFunctionInlining() +} + +val IrContainerExpression.innerInlinedBlockOrThis: IrContainerExpression + get() = (this as? IrReturnableBlock)?.statements?.singleOrNull() as? IrInlinedFunctionBlock ?: this +val IrReturnableBlock.inlineFunction: IrFunction? + get() = (this.statements.singleOrNull() as? IrInlinedFunctionBlock)?.inlineFunction +val IrReturnableBlock.sourceFileSymbol: IrFileSymbol? + get() = inlineFunction?.fileOrNull?.symbol \ No newline at end of file diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt index 0d25eccc8e8..e17a0972c4c 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.konan.llvm import kotlinx.cinterop.* import llvm.* -import org.jetbrains.kotlin.backend.common.ir.inlineFunction +import org.jetbrains.kotlin.ir.util.inlineFunction import org.jetbrains.kotlin.backend.common.ir.isUnconditional import org.jetbrains.kotlin.backend.common.lower.coroutines.getOrCreateFunctionWithContinuationStub import org.jetbrains.kotlin.backend.common.lower.inline.InlinerExpressionLocationHint diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/coverage/CoverageRegionCollector.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/coverage/CoverageRegionCollector.kt index 9c077320e82..670949e0ff1 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/coverage/CoverageRegionCollector.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/coverage/CoverageRegionCollector.kt @@ -4,7 +4,7 @@ */ package org.jetbrains.kotlin.backend.konan.llvm.coverage -import org.jetbrains.kotlin.backend.common.ir.sourceFileSymbol +import org.jetbrains.kotlin.ir.util.sourceFileSymbol import org.jetbrains.kotlin.backend.common.pop import org.jetbrains.kotlin.backend.common.push import org.jetbrains.kotlin.ir.IrElement diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt index 32deb6757f3..2997f2b7f30 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/InteropLowering.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.backend.konan.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.backend.common.ir.inlineFunction +import org.jetbrains.kotlin.ir.util.inlineFunction import org.jetbrains.kotlin.backend.common.lower.* import org.jetbrains.kotlin.backend.common.peek import org.jetbrains.kotlin.backend.common.pop diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt index bffbcdcb71d..abd2460c204 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/ReturnsInsertionLowering.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.backend.konan.lower import org.jetbrains.kotlin.backend.common.FileLoweringPass -import org.jetbrains.kotlin.backend.common.ir.inlineFunction -import org.jetbrains.kotlin.backend.common.ir.innerInlinedBlockOrThis +import org.jetbrains.kotlin.ir.util.inlineFunction +import org.jetbrains.kotlin.ir.util.innerInlinedBlockOrThis import org.jetbrains.kotlin.backend.common.lower.createIrBuilder import org.jetbrains.kotlin.backend.konan.Context import org.jetbrains.kotlin.ir.IrElement