Fix using IrFactory's deprecated api (#3750)

kotest · Nov 3, 2023 · 01bd98f · 01bd98f
1 parent ba28879
commit 01bd98f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.../jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt b/.../jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt
@@ -43,15 +43,16 @@ class NativeTransformer(messageCollector: MessageCollector, pluginContext: IrPlu
             name = Name.identifier(EntryPoint.LauncherValName)
          }.also { field ->
             field.correspondingPropertySymbol = this@apply.symbol
-            field.initializer = pluginContext.irFactory.createExpressionBody(startOffset, endOffset) {
-               this.expression = DeclarationIrBuilder(pluginContext, field.symbol).irBlock {
+            field.initializer = pluginContext.irFactory.createExpressionBody(
+               startOffset,
+               endOffset,
+               DeclarationIrBuilder(pluginContext, field.symbol).irBlock {
                   +callLauncher(launchFn, specs, configs) {
                      irCall(withTeamCityListenerMethodNameFn).also { withTeamCity ->
                         withTeamCity.dispatchReceiver = irCall(launcherConstructor)
                      }
                   }
-               }
-            }
+               })
          }
 
          addGetter {

diff --git a/.../src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt b/.../src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
+import org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.toLogger
 import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
@@ -82,8 +83,10 @@ class SpecIrGenerationExtension(private val messageCollector: MessageCollector)
                   name = Name.identifier(EntryPoint.LauncherValName)
                }.also { field ->
                   field.correspondingPropertySymbol = this@apply.symbol
-                  field.initializer = pluginContext.irFactory.createExpressionBody(startOffset, endOffset) {
-                     this.expression = DeclarationIrBuilder(pluginContext, field.symbol).irBlock {
+                  field.initializer = pluginContext.irFactory.createExpressionBody(
+                     startOffset,
+                     endOffset,
+                     DeclarationIrBuilder(pluginContext, field.symbol).irBlock {
                         +irCall(launchFn).also { launch ->
                            launch.dispatchReceiver = irCall(withTeamCityListenerMethodNameFn).also { withTeamCity ->
                               withTeamCity.dispatchReceiver = irCall(withSpecsFn).also { withSpecs ->
@@ -99,7 +102,7 @@ class SpecIrGenerationExtension(private val messageCollector: MessageCollector)
                            }
                         }
                      }
-                  }
+                  )
                }
 
                addGetter {