From 1ff7841ac73117f28c92bb555e6c20000b1f9efc Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Mon, 4 Sep 2023 14:13:39 +0300 Subject: [PATCH] [K/N][IR] Renamed PreInlineLowering to TypeOfLowering --- .../backend/konan/driver/phases/NativeLoweringPhases.kt | 2 +- .../backend/konan/lower/NativeInlineFunctionResolver.kt | 3 +-- .../lower/{PreInlineLowering.kt => TypeOfLowering.kt} | 7 +------ 3 files changed, 3 insertions(+), 9 deletions(-) rename kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/{PreInlineLowering.kt => TypeOfLowering.kt} (89%) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt index 417dda8d3d4..609fea44bc2 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt @@ -76,7 +76,7 @@ private val annotationImplementationPhase = createFileLoweringPhase( ) private val lowerBeforeInlinePhase = createFileLoweringPhase( - ::PreInlineLowering, + ::TypeOfLowering, name = "LowerBeforeInline", description = "Special operations processing before inlining" ) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt index 09450a979f1..cac406df82f 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.backend.common.DeclarationTransformer import org.jetbrains.kotlin.backend.common.lower.* import org.jetbrains.kotlin.backend.common.lower.inline.* import org.jetbrains.kotlin.backend.konan.* -import org.jetbrains.kotlin.backend.konan.serialization.KonanIrLinker import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.deepCopyWithVariables @@ -73,7 +72,7 @@ internal class NativeInlineFunctionResolver(override val context: Context, val g private fun lower(function: IrFunction, irFile: IrFile, functionIsCached: Boolean) { val body = function.body ?: return - PreInlineLowering(context).lower(body, function, irFile) + TypeOfLowering(context).lower(body, function, irFile) ArrayConstructorLowering(context).lower(body, function) diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/PreInlineLowering.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOfLowering.kt similarity index 89% rename from kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/PreInlineLowering.kt rename to kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOfLowering.kt index db2616f4718..6bf1f8fcc87 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/PreInlineLowering.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/TypeOfLowering.kt @@ -21,12 +21,7 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.util.file import org.jetbrains.kotlin.ir.visitors.IrElementTransformer -/** - * This pass runs before inlining and performs the following additional transformations over some operations: - * - Assertion call removal. - * - First phase of typeOf intrinsic lowering. - */ -internal class PreInlineLowering(val context: Context) : BodyLoweringPass { +internal class TypeOfLowering(val context: Context) : BodyLoweringPass { override fun lower(irBody: IrBody, container: IrDeclaration) = lower(irBody, container, container.file) fun lower(irBody: IrBody, container: IrDeclaration, irFile: IrFile) {