Minor: IrActualizationResult -> IrActualizedResult
This commit is contained in:
committed by
Space Team
parent
b7bb9c317f
commit
3a60b30dae
+2
-2
@@ -70,7 +70,7 @@ internal fun PhaseContext.fir2Ir(
|
||||
}
|
||||
val diagnosticsReporter = DiagnosticReporterFactory.createPendingReporter()
|
||||
|
||||
val (irModuleFragment, components, pluginContext, irActualizationResult) = input.firResult.convertToIrAndActualize(
|
||||
val (irModuleFragment, components, pluginContext, irActualizedResult) = input.firResult.convertToIrAndActualize(
|
||||
fir2IrExtensions,
|
||||
IrGenerationExtension.getInstances(config.project),
|
||||
linkViaSignatures = false,
|
||||
@@ -120,7 +120,7 @@ internal fun PhaseContext.fir2Ir(
|
||||
throw KonanCompilationException("Compilation failed: there were some diagnostics during fir2ir")
|
||||
}
|
||||
|
||||
return Fir2IrOutput(input.firResult, symbols, irModuleFragment, components, pluginContext, irActualizationResult, usedLibraries)
|
||||
return Fir2IrOutput(input.firResult, symbols, irModuleFragment, components, pluginContext, irActualizedResult, usedLibraries)
|
||||
}
|
||||
|
||||
private fun PhaseContext.createKonanSymbols(
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ internal fun PhaseContext.firSerializer(
|
||||
val usedResolvedLibraries = resolvedLibraries.filter {
|
||||
(!it.isDefault && !configuration.getBoolean(KonanConfigKeys.PURGE_USER_LIBS)) || it in input.usedLibraries
|
||||
}
|
||||
val actualizedFirDeclarations = input.irActualizationResult.extractFirDeclarations()
|
||||
val actualizedFirDeclarations = input.irActualizedResult.extractFirDeclarations()
|
||||
return serializeNativeModule(
|
||||
configuration = configuration,
|
||||
messageLogger = configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None,
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
|
||||
package org.jetbrains.kotlin.backend.konan.driver.phases
|
||||
|
||||
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult
|
||||
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult
|
||||
import org.jetbrains.kotlin.backend.konan.driver.PhaseContext
|
||||
import org.jetbrains.kotlin.backend.konan.driver.PhaseEngine
|
||||
import org.jetbrains.kotlin.backend.konan.fir2Ir
|
||||
@@ -22,7 +22,7 @@ internal data class Fir2IrOutput(
|
||||
val irModuleFragment: IrModuleFragment,
|
||||
val components: Fir2IrComponents,
|
||||
val pluginContext: Fir2IrPluginContext,
|
||||
val irActualizationResult: IrActualizationResult?,
|
||||
val irActualizedResult: IrActualizedResult?,
|
||||
val usedLibraries: Set<KotlinResolvedLibrary>
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user