diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt index e9863a62ee0..4bdd5cc62e8 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LateinitLowering.kt @@ -34,20 +34,17 @@ import org.jetbrains.kotlin.ir.util.resolveFakeOverride import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid -fun makeLateinitPhase(generateParameterNameInAssertion: Boolean) = object : CompilerPhase { +fun makeLateinitPhase() = object : CompilerPhase { override val name = "Lateinit" override val description = "Insert checks for lateinit field references" override fun invoke(context: CommonBackendContext, input: IrFile): IrFile { - LateinitLowering(context, generateParameterNameInAssertion).lower(input) + LateinitLowering(context).lower(input) return input } } -class LateinitLowering( - val context: CommonBackendContext, - private val generateParameterNameInAssertion: Boolean = false -) : FileLoweringPass { +class LateinitLowering(val context: CommonBackendContext) : FileLoweringPass { override fun lower(irFile: IrFile) { irFile.transformChildrenVoid(object : IrElementTransformerVoid() { override fun visitProperty(declaration: IrProperty): IrStatement { @@ -128,17 +125,15 @@ class LateinitLowering( private fun IrBuilderWithScope.throwUninitializedPropertyAccessException(name: String) = irCall(throwErrorFunction).apply { - if (generateParameterNameInAssertion) { - putValueArgument( - 0, - IrConstImpl.string( - UNDEFINED_OFFSET, - UNDEFINED_OFFSET, - context.irBuiltIns.stringType, - name - ) + putValueArgument( + 0, + IrConstImpl.string( + UNDEFINED_OFFSET, + UNDEFINED_OFFSET, + context.irBuiltIns.stringType, + name ) - } + ) } private val throwErrorFunction = context.ir.symbols.ThrowUninitializedPropertyAccessException.owner diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt index 2866ce0a52b..e93ced2137b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt @@ -67,7 +67,7 @@ private val ArrayInlineConstructorLoweringPhase = makeJsPhase( ) private val LateinitLoweringPhase = makeJsPhase( - { context, module -> LateinitLowering(context, true).lower(module) }, + { context, module -> LateinitLowering(context).lower(module) }, name = "LateinitLowering", description = "Insert checks for lateinit field references" ) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt index a040fe08d51..b4ddf311a97 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt @@ -49,7 +49,7 @@ private val KCallableNamePropertyPhase = makeJvmPhase( ) private val LateinitPhase = makeJvmPhase( - { context, file -> LateinitLowering(context, true).lower(file) }, + { context, file -> LateinitLowering(context).lower(file) }, name = "Lateinit", description = "Insert checks for lateinit field references" )