[K2] Add languageVersionSettings to Fir2IrConfiguration class
This commit is contained in:
@@ -130,7 +130,10 @@ fun transformFirToIr(
|
||||
val firResult = FirResult(firOutputs)
|
||||
return firResult.convertToIrAndActualize(
|
||||
fir2IrExtensions,
|
||||
Fir2IrConfiguration(linkViaSignatures = false),
|
||||
Fir2IrConfiguration(
|
||||
languageVersionSettings = moduleStructure.compilerConfiguration.languageVersionSettings,
|
||||
linkViaSignatures = false
|
||||
),
|
||||
IrGenerationExtension.getInstances(moduleStructure.project),
|
||||
signatureComposerCreator = null,
|
||||
irMangler = JsManglerIr,
|
||||
@@ -138,7 +141,6 @@ fun transformFirToIr(
|
||||
visibilityConverter = Fir2IrVisibilityConverter.Default,
|
||||
kotlinBuiltIns = builtInsModule ?: DefaultBuiltIns.Instance,
|
||||
diagnosticReporter = diagnosticsReporter,
|
||||
languageVersionSettings = moduleStructure.compilerConfiguration.languageVersionSettings,
|
||||
fir2IrResultPostCompute = {
|
||||
(this.irModuleFragment.descriptor as? FirModuleDescriptor)?.let { it.allDependencyModules = librariesDescriptors }
|
||||
}
|
||||
|
||||
+1
-1
@@ -154,6 +154,7 @@ object FirKotlinToJvmBytecodeCompiler {
|
||||
|
||||
val fir2IrExtensions = JvmFir2IrExtensions(moduleConfiguration, JvmIrDeserializerImpl(), JvmIrMangler)
|
||||
val fir2IrConfiguration = Fir2IrConfiguration(
|
||||
languageVersionSettings = moduleConfiguration.languageVersionSettings,
|
||||
linkViaSignatures = moduleConfiguration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES)
|
||||
)
|
||||
val fir2IrAndIrActualizerResult = firResult.convertToIrAndActualizeForJvm(
|
||||
@@ -161,7 +162,6 @@ object FirKotlinToJvmBytecodeCompiler {
|
||||
fir2IrConfiguration,
|
||||
irGenerationExtensions,
|
||||
diagnosticsReporter,
|
||||
moduleConfiguration.languageVersionSettings
|
||||
)
|
||||
|
||||
performanceManager?.notifyIRTranslationFinished()
|
||||
|
||||
@@ -232,12 +232,12 @@ fun convertAnalyzedFirToIr(
|
||||
IrGenerationExtension.getInstances(it)
|
||||
} ?: emptyList()
|
||||
val fir2IrConfiguration = Fir2IrConfiguration(
|
||||
languageVersionSettings = input.configuration.languageVersionSettings,
|
||||
linkViaSignatures = input.configuration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES)
|
||||
)
|
||||
val (irModuleFragment, components, pluginContext, irActualizedResult) =
|
||||
analysisResults.convertToIrAndActualizeForJvm(
|
||||
extensions, fir2IrConfiguration, irGenerationExtensions,
|
||||
environment.diagnosticsReporter, input.configuration.languageVersionSettings
|
||||
extensions, fir2IrConfiguration, irGenerationExtensions, environment.diagnosticsReporter,
|
||||
)
|
||||
|
||||
return ModuleCompilerIrBackendInput(
|
||||
|
||||
Reference in New Issue
Block a user