Rewriting the struct package

Author: jisungbin

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/ComposeInvestigatorBaseLower.kt

@@ -21,8 +21,8 @@ import land.sungbin.composeinvestigator.compiler.Stability_RUNTIME
 import land.sungbin.composeinvestigator.compiler.Stability_UNKNOWN
 import land.sungbin.composeinvestigator.compiler.fromFqName
 import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationLogger
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTable
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigator
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import land.sungbin.composeinvestigator.compiler.struct.IrValueArgument
 import land.sungbin.composeinvestigator.compiler.struct.get
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
@@ -93,7 +93,7 @@ import org.jetbrains.kotlin.types.Variance
 public open class ComposeInvestigatorBaseLower(
   protected val context: IrPluginContext,
   protected val messageCollector: MessageCollector, // TODO context.createDiagnosticReporter() (Blocked: "This API is not supported for K2")
-  protected val tables: IrInvalidationTraceTableHolder,
+  protected val tables: IrComposeInvestigatorHolder,
 ) : IrElementTransformerVoidWithContext() {
   private var ownStabilitySymbol: IrClassSymbol? = null
   private var ownStabilityCertainSymbol: IrClassSymbol? = null
@@ -217,21 +217,21 @@ public open class ComposeInvestigatorBaseLower(
   protected open fun firstTransformComposableBody(
     composable: IrSimpleFunction,
     body: IrBody,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrBody = body
 
   // (MUST) LoadingOrder.FIRST
   protected open fun firstTransformStateInitializer(
     name: Name,
     initializer: IrExpression,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrExpression = initializer
 
   // (MUST) LoadingOrder.LAST
   protected open fun lastTransformSkipToGroupEndCall(
     composable: IrSimpleFunction,
     expression: IrCall,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrExpression = expression
 
   private fun IrVariable.isStateDeclaration(): Boolean {

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/InvalidationProcessTracingFirstTransformer.kt

@@ -10,8 +10,8 @@ import land.sungbin.composeinvestigator.compiler.analysis.DurationWritableSlices
 import land.sungbin.composeinvestigator.compiler.fromFqName
 import land.sungbin.composeinvestigator.compiler.log
 import land.sungbin.composeinvestigator.compiler.struct.IrComposableInformation
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTable
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigator
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.getCompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -82,7 +82,7 @@ import org.jetbrains.kotlin.name.SpecialNames
 public class InvalidationProcessTracingFirstTransformer(
   context: IrPluginContext,
   messageCollector: MessageCollector,
-  tables: IrInvalidationTraceTableHolder,
+  tables: IrComposeInvestigatorHolder,
   private val stabilityInferencer: StabilityInferencer,
 ) : ComposeInvestigatorBaseLower(context, messageCollector, tables) {
   private val currentComposerSymbol: IrPropertySymbol =
@@ -92,7 +92,7 @@ public class InvalidationProcessTracingFirstTransformer(
   override fun firstTransformComposableBody(
     composable: IrSimpleFunction,
     body: IrBody,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrBody {
     messageCollector.log(
       "Visit composable body: ${composable.name}",
@@ -183,7 +183,7 @@ public class InvalidationProcessTracingFirstTransformer(
     newStatements += invalidationReasonVariable
 
     val invalidationResultProcessed = irGetValue(invalidationReasonVariable)
-      .apply { type = invalidationLogger.irInvalidationResultSymbol.defaultType }
+      .apply { type = invalidationLogger.invalidationResultSymbol.defaultType }
     val logger = invalidationLogger.irLog(affectedComposable, result = invalidationResultProcessed)
 
     newStatements += logger

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/InvalidationSkipTracingLastTransformer.kt

@@ -7,8 +7,8 @@ import land.sungbin.composeinvestigator.compiler.COMPOSER_FQN
 import land.sungbin.composeinvestigator.compiler.analysis.DurationWritableSlices
 import land.sungbin.composeinvestigator.compiler.log
 import land.sungbin.composeinvestigator.compiler.struct.IrComposableInformation
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTable
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigator
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.getCompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -57,12 +57,12 @@ import org.jetbrains.kotlin.ir.util.file
 public class InvalidationSkipTracingLastTransformer(
   context: IrPluginContext,
   messageCollector: MessageCollector,
-  table: IrInvalidationTraceTableHolder,
+  table: IrComposeInvestigatorHolder,
 ) : ComposeInvestigatorBaseLower(context, messageCollector, table) {
   override fun lastTransformSkipToGroupEndCall(
     composable: IrSimpleFunction,
     expression: IrCall,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrExpression {
     messageCollector.log(
       "Visit skipToGroupEnd call: ${composable.name}",
@@ -92,7 +92,7 @@ public class InvalidationSkipTracingLastTransformer(
     }
 
     val invalidationResultSkipped = invalidationLogger.irInvalidationResultSkipped()
-      .apply { type = invalidationLogger.irInvalidationResultSymbol.defaultType }
+      .apply { type = invalidationLogger.invalidationResultSymbol.defaultType }
     val logger = invalidationLogger.irLog(affectedComposable, result = invalidationResultSkipped)
 
     return IrBlockImpl(

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/InvalidationTraceTableInstantiateTransformer.kt

@@ -5,8 +5,8 @@ package land.sungbin.composeinvestigator.compiler.lower
 import land.sungbin.composeinvestigator.compiler.COMPOSABLE_INVALIDATION_TRACE_TABLE_FQN
 import land.sungbin.composeinvestigator.compiler.NO_INVESTIGATION_FQN
 import land.sungbin.composeinvestigator.compiler.log
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTable
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigator
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.jvm.ir.getKtFile
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -45,10 +45,10 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
 public class InvalidationTraceTableInstantiateTransformer(
   private val context: IrPluginContext,
   private val messageCollector: MessageCollector, // TODO context.createDiagnosticReporter() (Blocked: "This API is not supported for K2")
-) : IrElementTransformerVoid(), IrInvalidationTraceTableHolder {
-  private val tables = mutableMapOf<IrFile, IrInvalidationTraceTable>()
+) : IrElementTransformerVoid(), IrComposeInvestigatorHolder {
+  private val tables = mutableMapOf<IrFile, IrComposeInvestigator>()
 
-  override fun tableByFile(file: IrFile): IrInvalidationTraceTable =
+  override fun getByFile(file: IrFile): IrComposeInvestigator =
     tables[file] ?: throw CompilationException(
       "No table for ${file.name}",
       /* cause = */ null,
@@ -69,8 +69,8 @@ public class InvalidationTraceTableInstantiateTransformer(
       val existsTable = declaration.findDeclaration<IrProperty> { property ->
         property.backingField?.type?.classFqName == COMPOSABLE_INVALIDATION_TRACE_TABLE_FQN
       }
-      val table = existsTable?.let(IrInvalidationTraceTable::from) ?: run {
-        IrInvalidationTraceTable.create(context, declaration).also { table ->
+      val table = existsTable?.let(IrComposeInvestigator::from) ?: run {
+        IrComposeInvestigator.create(context, declaration).also { table ->
           declaration.declarations.add(0, table.rawProp.also { prop -> prop.setDeclarationsParent(declaration) })
         }
       }

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/InvalidationTraceTableIntrinsicCallTransformer.kt

@@ -13,7 +13,7 @@ import land.sungbin.composeinvestigator.compiler.analysis.DurationWritableSlices
 import land.sungbin.composeinvestigator.compiler.analysis.set
 import land.sungbin.composeinvestigator.compiler.fromFqName
 import land.sungbin.composeinvestigator.compiler.struct.IrComposableInformation
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import land.sungbin.composeinvestigator.compiler.struct.get
 import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.cast
 public class InvalidationTraceTableIntrinsicCallTransformer(
   private val context: IrPluginContext,
   private val irComposableInformation: IrComposableInformation,
-  private val tables: IrInvalidationTraceTableHolder,
+  private val tables: IrComposeInvestigatorHolder,
 ) : IrElementTransformerVoidWithContext() {
   private val tableSymbol = context.referenceClass(ClassId.topLevel(COMPOSABLE_INVALIDATION_TRACE_TABLE_FQN))!!
   private val composableNameSymbol = context.referenceClass(ClassId.topLevel(COMPOSABLE_NAME_FQN))!!.owner

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/lower/StateInitializerFirstTransformer.kt

@@ -3,8 +3,8 @@
 package land.sungbin.composeinvestigator.compiler.lower
 
 import land.sungbin.composeinvestigator.compiler.log
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTable
-import land.sungbin.composeinvestigator.compiler.struct.IrInvalidationTraceTableHolder
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigator
+import land.sungbin.composeinvestigator.compiler.struct.IrComposeInvestigatorHolder
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.getCompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -40,21 +40,21 @@ import org.jetbrains.kotlin.name.Name
 public class StateInitializerFirstTransformer(
   context: IrPluginContext,
   messageCollector: MessageCollector,
-  tables: IrInvalidationTraceTableHolder,
+  tables: IrComposeInvestigatorHolder,
 ) : ComposeInvestigatorBaseLower(context, messageCollector, tables) {
   // TODO Special behaviour of 'remember' and 'rememberSaveable':
   //  Transforms should be performed inside the 'remember[Saveable]' lambda, not outside of it.
   override fun firstTransformStateInitializer(
     name: Name,
     initializer: IrExpression,
-    table: IrInvalidationTraceTable,
+    table: IrComposeInvestigator,
   ): IrExpression {
     messageCollector.log(
       "Visit state initializer: ${name.asString()}",
       initializer.getCompilerMessageLocation(table.rawProp.file),
     )
 
-    return table.irRegisterStateObject(initializer, irString(name.asString())).also {
+    return table.callRegisterStateObject(initializer, irString(name.asString())).also {
       messageCollector.log(
         "Transform state initializer succeed: ${name.asString()}",
         initializer.getCompilerMessageLocation(table.rawProp.file),

compiler/src/main/kotlin/land/sungbin/composeinvestigator/compiler/struct/IrComposableInformation.kt

@@ -2,68 +2,33 @@
 // SPDX-License-Identifier: Apache-2.0
 package land.sungbin.composeinvestigator.compiler.struct
 
-import java.lang.ref.WeakReference
-import land.sungbin.composeinvestigator.compiler.COMPOSABLE_INFORMATION_FQN
-import land.sungbin.composeinvestigator.compiler.ComposableInformation_WITH_COMPOUND_KEY
-import land.sungbin.composeinvestigator.compiler.fromFqName
+import land.sungbin.composeinvestigator.compiler.InvestigatorNames
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.expressions.IrConst
-import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
+import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.fromSymbolOwner
-import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
 import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.utils.addToStdlib.cast
 
 /** Helper class to make the `ComposableInformation` class easier to handle in IR. */
 public class IrComposableInformation(context: IrPluginContext) {
-  private val symbol = context.referenceClass(ClassId.topLevel(COMPOSABLE_INFORMATION_FQN))!!
+  private val symbol = context.referenceClass(ClassId.topLevel(InvestigatorNames.composableInformation))!!
 
-  /** Create a `ComposableInformation` constructor except for the `compoundKey` value. */
   public operator fun invoke(
     name: IrConst,
     packageName: IrConst,
     fileName: IrConst,
-  ): IrConstructorCallImpl = IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.defaultType,
-    constructorSymbol = symbol.constructors.single(),
-  ).apply {
-    putValueArgument(0, name)
-    putValueArgument(1, packageName)
-    putValueArgument(2, fileName)
-  }
-
-  /**
-   * Copy the `ComposableInformation` constructor call, changing only `name` to the
-   * new value.
-   *
-   * @param target The target `ComposableInformation` constructor call to copy from.
-   * @param name The new value for the `name` parameter.
-   */
-  public fun copyFrom(
-    target: IrConstructorCall,
-    name: IrConst,
-  ): IrConstructorCallImpl = invoke(
-    name = name,
-    packageName = target.getValueArgument(1)!!.cast(),
-    fileName = target.getValueArgument(2)!!.cast(),
-  )
-
-  public companion object {
-    private var _withCompoundKeySymbol: WeakReference<IrSimpleFunctionSymbol>? = null
-
-    /** Get the `name` value from the `ComposableInformation` constructor call. */
-    public fun getName(target: IrConstructorCall): IrConst = target.getValueArgument(0)!!.cast()
-
-    /** Gets the `ComposableInformation#withCompoundKey` symbol. */
-    public fun withCompoundKeySymbol(context: IrPluginContext): IrSimpleFunctionSymbol =
-      _withCompoundKeySymbol?.get() ?: run {
-        val targetFqn = COMPOSABLE_INFORMATION_FQN.child(ComposableInformation_WITH_COMPOUND_KEY)
-        context.referenceFunctions(CallableId.fromFqName(targetFqn)).single()
-      }
-        .also { symbol -> _withCompoundKeySymbol = WeakReference(symbol) }
-  }
+    compoundKey: IrExpression?,
+  ): IrConstructorCallImpl =
+    IrConstructorCallImpl.fromSymbolOwner(
+      type = symbol.defaultType,
+      constructorSymbol = symbol.constructors.single(),
+    ).apply {
+      putValueArgument(0, name)
+      putValueArgument(1, packageName)
+      putValueArgument(2, fileName)
+      if (compoundKey != null) putValueArgument(3, compoundKey)
+    }
 }