[FIR] Pass diagnosticReporter in Fir2IrConfiguration
This parameter will be used to report diagnostics from constant evaluator, in addition to report diagnostic from actualizer.
This commit is contained in:
@@ -229,6 +229,7 @@ fun transformFirToIr(
|
||||
fir2IrExtensions,
|
||||
Fir2IrConfiguration(
|
||||
languageVersionSettings = moduleStructure.compilerConfiguration.languageVersionSettings,
|
||||
diagnosticReporter = diagnosticsReporter,
|
||||
linkViaSignatures = false,
|
||||
evaluatedConstTracker = moduleStructure.compilerConfiguration
|
||||
.putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()),
|
||||
@@ -240,12 +241,10 @@ fun transformFirToIr(
|
||||
firMangler = FirJsKotlinMangler(),
|
||||
visibilityConverter = Fir2IrVisibilityConverter.Default,
|
||||
kotlinBuiltIns = builtInsModule ?: DefaultBuiltIns.Instance,
|
||||
diagnosticReporter = diagnosticsReporter,
|
||||
actualizerTypeContextProvider = ::IrTypeSystemContextImpl,
|
||||
fir2IrResultPostCompute = {
|
||||
(this.irModuleFragment.descriptor as? FirModuleDescriptor)?.let { it.allDependencyModules = librariesDescriptors }
|
||||
}
|
||||
)
|
||||
actualizerTypeContextProvider = ::IrTypeSystemContextImpl
|
||||
) {
|
||||
(this.irModuleFragment.descriptor as? FirModuleDescriptor)?.let { it.allDependencyModules = librariesDescriptors }
|
||||
}
|
||||
}
|
||||
|
||||
private class Fir2KlibSerializer(
|
||||
|
||||
+1
-1
@@ -155,6 +155,7 @@ object FirKotlinToJvmBytecodeCompiler {
|
||||
val fir2IrExtensions = JvmFir2IrExtensions(moduleConfiguration, JvmIrDeserializerImpl(), JvmIrMangler)
|
||||
val fir2IrConfiguration = Fir2IrConfiguration(
|
||||
languageVersionSettings = moduleConfiguration.languageVersionSettings,
|
||||
diagnosticReporter = diagnosticsReporter,
|
||||
linkViaSignatures = moduleConfiguration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES),
|
||||
evaluatedConstTracker = moduleConfiguration
|
||||
.putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()),
|
||||
@@ -164,7 +165,6 @@ object FirKotlinToJvmBytecodeCompiler {
|
||||
fir2IrExtensions,
|
||||
fir2IrConfiguration,
|
||||
irGenerationExtensions,
|
||||
diagnosticsReporter,
|
||||
)
|
||||
|
||||
performanceManager?.notifyIRTranslationFinished()
|
||||
|
||||
@@ -180,6 +180,7 @@ fun convertAnalyzedFirToIr(
|
||||
} ?: emptyList()
|
||||
val fir2IrConfiguration = Fir2IrConfiguration(
|
||||
languageVersionSettings = input.configuration.languageVersionSettings,
|
||||
diagnosticReporter = environment.diagnosticsReporter,
|
||||
linkViaSignatures = input.configuration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES),
|
||||
evaluatedConstTracker = input.configuration
|
||||
.putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()),
|
||||
@@ -187,7 +188,7 @@ fun convertAnalyzedFirToIr(
|
||||
)
|
||||
val (irModuleFragment, components, pluginContext, irActualizedResult) =
|
||||
analysisResults.convertToIrAndActualizeForJvm(
|
||||
extensions, fir2IrConfiguration, irGenerationExtensions, environment.diagnosticsReporter,
|
||||
extensions, fir2IrConfiguration, irGenerationExtensions,
|
||||
)
|
||||
|
||||
return ModuleCompilerIrBackendInput(
|
||||
|
||||
Reference in New Issue
Block a user