Apply the IrSymbol.defaultType extension

jisungbin · Nov 22, 2023 · f6fca26 · f6fca26
1 parent d46625b
commit f6fca26
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/...n/kotlin/land/sungbin/composeinvestigator/compiler/internal/stability/StabilityWrapper.kt b/...n/kotlin/land/sungbin/composeinvestigator/compiler/internal/stability/StabilityWrapper.kt
@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
 import org.jetbrains.kotlin.ir.expressions.impl.IrConstructorCallImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
+import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
 import org.jetbrains.kotlin.ir.types.typeWithArguments
 import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.types.Variance
 
@@ -52,7 +52,7 @@ private fun IrPluginContext.irDeclarationStabilityCertain(stable: IrConst<Boolea
       .also { symbol -> declarationStabilityCertainSymbol = symbol })
 
   return IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.owner.defaultType,
+    type = symbol.defaultType,
     constructorSymbol = symbol.constructors.single(),
   ).apply {
     putValueArgument(0, stable)
@@ -65,7 +65,7 @@ private fun IrPluginContext.irDeclarationStabilityRuntime(declarationName: IrCon
       .also { symbol -> declarationStabilityRuntimeSymbol = symbol })
 
   return IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.owner.defaultType,
+    type = symbol.defaultType,
     constructorSymbol = symbol.constructors.single(),
   ).apply {
     putValueArgument(0, declarationName)
@@ -78,7 +78,7 @@ private fun IrPluginContext.irDeclarationStabilityUnknown(declarationName: IrCon
       .also { symbol -> declarationStabilityUnknownSymbol = symbol })
 
   return IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.owner.defaultType,
+    type = symbol.defaultType,
     constructorSymbol = symbol.constructors.single(),
   ).apply {
     putValueArgument(0, declarationName)
@@ -91,7 +91,7 @@ private fun IrPluginContext.irDeclarationStabilityParameter(parameterName: IrCon
       .also { symbol -> declarationStabilityParameterSymbol = symbol })
 
   return IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.owner.defaultType,
+    type = symbol.defaultType,
     constructorSymbol = symbol.constructors.single(),
   ).apply {
     putValueArgument(0, parameterName)
@@ -107,10 +107,10 @@ private fun IrPluginContext.irDeclarationStabilityCombined(elements: List<IrCons
       .also { parentSymbol -> declarationStabilitySymbol = parentSymbol })
 
   return IrConstructorCallImpl.fromSymbolOwner(
-    type = symbol.owner.defaultType,
+    type = symbol.defaultType,
     constructorSymbol = symbol.constructors.single(),
   ).apply {
-    val varargElementType = parentSymbol.owner.defaultType
+    val varargElementType = parentSymbol.defaultType
     val genericTypeProjection = makeTypeProjection(type = varargElementType, variance = Variance.OUT_VARIANCE)
     val genericType = irBuiltIns.arrayClass.typeWithArguments(listOf(genericTypeProjection))
     val vararg = IrVarargImpl(

diff --git a/...sungbin/composeinvestigator/compiler/internal/tracker/InvalidationTrackableTransformer.kt b/...sungbin/composeinvestigator/compiler/internal/tracker/InvalidationTrackableTransformer.kt
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrVarargImpl
 import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.types.impl.makeTypeProjection
 import org.jetbrains.kotlin.ir.types.typeWithArguments
-import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.ir.util.dump
 import org.jetbrains.kotlin.ir.util.dumpKotlinLike
 import org.jetbrains.kotlin.types.Variance
@@ -46,7 +45,7 @@ internal class InvalidationTrackableTransformer(
     val currentFunctionLocation = function.getSafelyLocation()
     val currentInvalidationTrackTable = currentInvalidationTrackTable!!
 
-    val paramInfoType = currentInvalidationTrackTable.paramInfoSymbol.owner.defaultType
+    val paramInfoType = currentInvalidationTrackTable.paramInfoSymbol.defaultType
     val paramInfoGenericTypeProjection = makeTypeProjection(type = paramInfoType, variance = Variance.OUT_VARIANCE)
     val paramInfoGenericType = irBuiltIns.arrayClass.typeWithArguments(listOf(paramInfoGenericTypeProjection))
     val paramInfos = IrVarargImpl(

diff --git a/...in/land/sungbin/composeinvestigator/compiler/internal/tracker/IrInvalidationTrackTable.kt b/...in/land/sungbin/composeinvestigator/compiler/internal/tracker/IrInvalidationTrackTable.kt
@@ -35,9 +35,9 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrExpressionBodyImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol
+import org.jetbrains.kotlin.ir.types.defaultType
 import org.jetbrains.kotlin.ir.util.SYNTHETIC_OFFSET
 import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.defaultType
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
@@ -56,7 +56,7 @@ public class IrInvalidationTrackTable private constructor(public val prop: IrPro
     valueHashCode: IrVariable,
   ): IrConstructorCall =
     IrConstructorCallImpl.fromSymbolOwner(
-      type = paramInfoSymbol.owner.defaultType,
+      type = paramInfoSymbol.defaultType,
       constructorSymbol = paramInfoSymbol.constructors.single(),
     ).apply {
       fun IrVariable.valueGetter(): IrGetValue =
@@ -137,7 +137,7 @@ private fun irInvalidationTrackTableProp(
       name = propName
       isStatic = true
       isFinal = true
-      type = superSymbol.owner.defaultType
+      type = superSymbol.defaultType
       visibility = DescriptorVisibilities.PRIVATE
     }.also { field ->
       field.parent = currentFile
@@ -146,13 +146,13 @@ private fun irInvalidationTrackTableProp(
         startOffset = SYNTHETIC_OFFSET,
         endOffset = SYNTHETIC_OFFSET,
         expression = IrConstructorCallImpl.fromSymbolOwner(
-          type = superSymbol.owner.defaultType,
+          type = superSymbol.defaultType,
           constructorSymbol = superSymbol.constructors.single(),
         ),
       )
     }
     prop.addGetter {
-      returnType = superSymbol.owner.defaultType
+      returnType = superSymbol.defaultType
       visibility = DescriptorVisibilities.PRIVATE
       origin = IrDeclarationOrigin.DEFAULT_PROPERTY_ACCESSOR
     }.also { getter ->