Minor: IrActualizationResult -> IrActualizedResult
This commit is contained in:
committed by
Space Team
parent
b7bb9c317f
commit
3a60b30dae
+2
-2
@@ -6,7 +6,7 @@
|
||||
package org.jetbrains.kotlin.test.backend.ir
|
||||
|
||||
import org.jetbrains.kotlin.KtSourceFile
|
||||
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizationResult
|
||||
import org.jetbrains.kotlin.backend.common.actualizer.IrActualizedResult
|
||||
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
|
||||
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
|
||||
import org.jetbrains.kotlin.codegen.state.GenerationState
|
||||
@@ -40,7 +40,7 @@ sealed class IrBackendInput : ResultingArtifact.BackendInput<IrBackendInput>() {
|
||||
val expectDescriptorToSymbol: MutableMap<DeclarationDescriptor, IrSymbol>, // TODO: abstract from descriptors
|
||||
val diagnosticsCollector: BaseDiagnosticsCollector,
|
||||
val hasErrors: Boolean,
|
||||
val serializeSingleFile: (KtSourceFile, IrActualizationResult?) -> ProtoBuf.PackageFragment
|
||||
val serializeSingleFile: (KtSourceFile, IrActualizedResult?) -> ProtoBuf.PackageFragment
|
||||
) : IrBackendInput() {
|
||||
override val irModuleFragment: IrModuleFragment
|
||||
get() = mainModuleFragment
|
||||
|
||||
+3
-3
@@ -111,11 +111,11 @@ class Fir2IrJsResultsConverter(
|
||||
expectDescriptorToSymbol = mutableMapOf(),
|
||||
diagnosticsCollector = DiagnosticReporterFactory.createReporter(),
|
||||
hasErrors = inputArtifact.hasErrors
|
||||
) { file, irActualizationResult ->
|
||||
) { file, irActualizedResult ->
|
||||
val (firFile, components) = firFilesAndComponentsBySourceFile[file]
|
||||
?: error("cannot find FIR file by source file ${file.name} (${file.path})")
|
||||
if (actualizedExpectDeclarations == null && irActualizationResult != null) {
|
||||
actualizedExpectDeclarations = irActualizationResult.extractFirDeclarations()
|
||||
if (actualizedExpectDeclarations == null && irActualizedResult != null) {
|
||||
actualizedExpectDeclarations = irActualizedResult.extractFirDeclarations()
|
||||
}
|
||||
serializeSingleFirFile(
|
||||
firFile,
|
||||
|
||||
+1
-1
@@ -108,7 +108,7 @@ class Fir2IrResultsConverter(
|
||||
phaseConfig,
|
||||
components.irProviders,
|
||||
fir2IrExtensions,
|
||||
FirJvmBackendExtension(components, irActualizationResult = null),
|
||||
FirJvmBackendExtension(components, irActualizedResult = null),
|
||||
pluginContext,
|
||||
notifyCodegenStart = {},
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user