[IR] Merge LateinitLowering with JvmLateinitLowering

Those lowerings were essentially duplicates and were doing the same thing. Here we choose the JVM version, becouse it's simpler, but adopt it a bit to support lateinit properties in other files. ^KT-71141
JetBrains · Nov 19, 2024 · 17aa734 · 17aa734
1 parent 2a2bc69
commit 17aa734
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 392 deletions.
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Mappings.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/Mappings.kt
@@ -33,7 +33,6 @@ var IrSimpleFunction.suspendFunction: IrSimpleFunction? by irAttribute(followAtt
 var IrFunction.defaultArgumentsOriginalFunction: IrFunction? by irAttribute(followAttributeOwner = false)
 
 open class Mapping {
-    val lateInitFieldToNullableField: DeclarationMapping<IrField, IrField> by AttributeBasedMappingDelegate()
     val capturedConstructors: MapBasedMapping<IrConstructor, IrConstructor> = MapBasedMapping()
 
     abstract class DeclarationMapping<K : IrDeclaration, V> {

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
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
@@ -146,19 +146,9 @@ private val stringConcatenationLoweringPhase = makeIrModulePhase(
     name = "JsStringConcatenationLowering",
 )
 
-private val lateinitNullableFieldsPhase = makeIrModulePhase(
-    ::NullableFieldsForLateinitCreationLowering,
-    name = "LateinitNullableFields",
-)
-
-private val lateinitDeclarationLoweringPhase = makeIrModulePhase(
-    ::NullableFieldsDeclarationLowering,
-    name = "LateinitDeclarations",
-)
-
-private val lateinitUsageLoweringPhase = makeIrModulePhase(
-    ::LateinitUsageLowering,
-    name = "LateinitUsage",
+private val lateinitPhase = makeIrModulePhase(
+    ::LateinitLowering,
+    name = "LateinitLowering",
 )
 
 private val kotlinNothingValueExceptionPhase = makeIrModulePhase(
@@ -192,7 +182,7 @@ private val sharedVariablesLoweringPhase = makeIrModulePhase(
         SharedVariablesLowering(JsSharedVariablesManager(context.irBuiltIns, context.dynamicType, context.intrinsics))
     },
     name = "SharedVariablesLowering",
-    prerequisite = setOf(lateinitDeclarationLoweringPhase, lateinitUsageLoweringPhase)
+    prerequisite = setOf(lateinitPhase)
 )
 
 private val outerThisSpecialAccessorInInlineFunctionsPhase = makeIrModulePhase(
@@ -753,9 +743,7 @@ fun getJsLowerings(
     // BEGIN: Common Native/JS prefix.
     validateIrBeforeLowering,
     jsCodeOutliningPhase,
-    lateinitNullableFieldsPhase,
-    lateinitDeclarationLoweringPhase,
-    lateinitUsageLoweringPhase,
+    lateinitPhase,
     sharedVariablesLoweringPhase,
     outerThisSpecialAccessorInInlineFunctionsPhase,
     localClassesInInlineLambdasPhase,

diff --git a/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt b/compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/JvmLoweringPhases.kt
@@ -22,7 +22,7 @@ private val jvmFilePhases = createFilePhases<JvmBackendContext>(
     ::PolymorphicSignatureLowering,
     ::VarargLowering,
 
-    ::JvmLateinitLowering,
+    ::LateinitLowering,
     ::JvmInventNamesForLocalClasses,
 
     ::JvmInlineCallableReferenceToLambdaPhase,

diff --git a/...er/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmLateinitLowering.kt b/...er/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/JvmLateinitLowering.kt
diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/WasmLoweringPhases.kt
@@ -62,19 +62,9 @@ private val stringConcatenationLowering = makeIrModulePhase(
     name = "StringConcatenation",
 )
 
-private val lateinitNullableFieldsPhase = makeIrModulePhase(
-    ::NullableFieldsForLateinitCreationLowering,
-    name = "LateinitNullableFields",
-)
-
-private val lateinitDeclarationLoweringPhase = makeIrModulePhase(
-    ::NullableFieldsDeclarationLowering,
-    name = "LateinitDeclarations",
-)
-
-private val lateinitUsageLoweringPhase = makeIrModulePhase(
-    ::LateinitUsageLowering,
-    name = "LateinitUsage",
+private val lateinitPhase = makeIrModulePhase(
+    ::LateinitLowering,
+    name = "LateinitLowering",
 )
 
 private val rangeContainsLoweringPhase = makeIrModulePhase(
@@ -96,10 +86,7 @@ private val arrayConstructorPhase = makeIrModulePhase(
 private val sharedVariablesLoweringPhase = makeIrModulePhase(
     { context: WasmBackendContext -> SharedVariablesLowering(WasmSharedVariablesManager(context.wasmSymbols)) },
     name = "SharedVariablesLowering",
-    prerequisite = setOf(
-        lateinitDeclarationLoweringPhase,
-        lateinitUsageLoweringPhase
-    )
+    prerequisite = setOf(lateinitPhase)
 )
 
 private val localClassesInInlineLambdasPhase = makeIrModulePhase(
@@ -547,9 +534,7 @@ fun getWasmLowerings(
     excludeDeclarationsFromCodegenPhase,
     expectDeclarationsRemovingPhase,
 
-    lateinitNullableFieldsPhase,
-    lateinitDeclarationLoweringPhase,
-    lateinitUsageLoweringPhase,
+    lateinitPhase,
     rangeContainsLoweringPhase,
 
     sharedVariablesLoweringPhase,

diff --git a/...ckend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt b/...ckend.native/src/org/jetbrains/kotlin/backend/konan/driver/phases/NativeLoweringPhases.kt
@@ -155,11 +155,7 @@ private val arrayConstructorPhase = createFileLoweringPhase(
 )
 
 private val lateinitPhase = createFileLoweringPhase(
-        { context, irFile ->
-            NullableFieldsForLateinitCreationLowering(context).lower(irFile)
-            NullableFieldsDeclarationLowering(context).lower(irFile)
-            LateinitUsageLowering(context).lower(irFile)
-        },
+        ::LateinitLowering,
         name = "Lateinit",
 )
 

diff --git a/...ompiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ClassLayoutBuilder.kt b/...ompiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/ClassLayoutBuilder.kt
@@ -449,13 +449,7 @@ internal class ClassLayoutBuilder(val irClass: IrClass, val context: Context) {
      * All fields of the class instance.
      * The order respects the class hierarchy, i.e. a class [fields] contains superclass [fields] as a prefix.
      */
-    fun getFields(llvm: CodegenLlvmHelpers): List<FieldInfo> = getFieldsInternal(llvm).map { fieldInfo ->
-        val mappedField = fieldInfo.irField?.let { context.mapping.lateInitFieldToNullableField[it] ?: it }
-        if (mappedField == fieldInfo.irField)
-            fieldInfo
-        else
-            mappedField!!.toFieldInfo(llvm)
-    }
+    fun getFields(llvm: CodegenLlvmHelpers): List<FieldInfo> = getFieldsInternal(llvm)
 
     private var fields: List<FieldInfo>? = null
 

diff --git a/...piler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CachesAbiLowering.kt b/...piler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/CachesAbiLowering.kt
@@ -42,9 +42,6 @@ internal val INTERNAL_ABI_ORIGIN = IrDeclarationOriginImpl("INTERNAL_ABI")
  * and we have to explicitly add an external declaration.
  */
 internal class CachesAbiSupport(mapping: Mapping, private val irFactory: IrFactory) {
-    private val lateInitFieldToNullableField = mapping.lateInitFieldToNullableField
-
-
     fun getOuterThisAccessor(irClass: IrClass): IrSimpleFunction {
         require(irClass.isInner) { "Expected an inner class but was: ${irClass.render()}" }
         return irClass::outerThisAccessor.getOrSetIfNull {
@@ -83,12 +80,11 @@ internal class CachesAbiSupport(mapping: Mapping, private val irFactory: IrFacto
         require(irProperty.isLateinit) { "Expected a lateinit property but was: ${irProperty.render()}" }
         return irProperty::lateinitPropertyAccessor.getOrSetIfNull {
             val backingField = irProperty.backingField ?: error("Lateinit property ${irProperty.render()} should have a backing field")
-            val actualField = lateInitFieldToNullableField[backingField] ?: backingField
             val owner = irProperty.parent
             irFactory.buildFun {
                 name = getMangledNameFor("${irProperty.name}_field", owner)
                 origin = INTERNAL_ABI_ORIGIN
-                returnType = actualField.type
+                returnType = backingField.type
             }.apply {
                 parent = irProperty.getPackageFragment()
                 attributeOwnerId = irProperty // To be able to get the file.

diff --git a/...ckend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt b/...ckend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt
@@ -45,9 +45,7 @@ internal class NativeInlineFunctionResolver(
 
         NativeAssertionWrapperLowering(context).lower(function)
 
-        NullableFieldsForLateinitCreationLowering(context).lowerWithLocalDeclarations(function)
-        NullableFieldsDeclarationLowering(context).lowerWithLocalDeclarations(function)
-        LateinitUsageLowering(context).lower(body, function)
+        LateinitLowering(context).lower(body)
 
         SharedVariablesLowering(KonanSharedVariablesManager(context.irBuiltIns, context.ir.symbols)).lower(body, function)