[K2, MPP] Remove redundant expect declarations from klib metadata
^KT-57250 Fixed Introduce flat Fir2IrActualizedResult It contains output from Fir2Ir and IrActualizer
This commit is contained in:
committed by
Space Team
parent
d91efb212d
commit
ee73e4774b
+5
-4
@@ -275,7 +275,7 @@ class IncrementalFirJvmCompilerRunner(
|
||||
val extensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler)
|
||||
val irGenerationExtensions =
|
||||
(projectEnvironment as? VfsBasedProjectEnvironment)?.project?.let { IrGenerationExtension.getInstances(it) }.orEmpty()
|
||||
val platformIrOutput = cycleResult.convertToIrAndActualizeForJvm(
|
||||
val (irModuleFragment, components, pluginContext, irActualizationResult) = cycleResult.convertToIrAndActualizeForJvm(
|
||||
extensions,
|
||||
irGenerationExtensions,
|
||||
linkViaSignatures = false,
|
||||
@@ -289,9 +289,10 @@ class IncrementalFirJvmCompilerRunner(
|
||||
targetId,
|
||||
configuration,
|
||||
extensions,
|
||||
platformIrOutput.irModuleFragment,
|
||||
platformIrOutput.components,
|
||||
platformIrOutput.pluginContext
|
||||
irModuleFragment,
|
||||
components,
|
||||
pluginContext,
|
||||
irActualizationResult
|
||||
)
|
||||
|
||||
val codegenOutput = generateCodeFromIr(irInput, compilerEnvironment, performanceManager)
|
||||
|
||||
+2
-1
@@ -52,7 +52,8 @@ internal fun collectNewDirtySources(
|
||||
globalSerializationBindings,
|
||||
data.lastOrNull(),
|
||||
targetId,
|
||||
configuration
|
||||
configuration,
|
||||
irActualizationResult = null
|
||||
)
|
||||
data.push(serializer)
|
||||
body(serializer)
|
||||
|
||||
Reference in New Issue
Block a user