[K2] Add languageVersionSettings to Fir2IrConfiguration class

This commit is contained in:
Ivan Kylchik
2023-03-30 13:32:04 +02:00
committed by Space Team
parent e16231104e
commit fe989d0ba7
12 changed files with 36 additions and 29 deletions
@@ -147,11 +147,14 @@ fun AbstractFirAnalyzerFacade.convertToJsIr(
val libraries = resolveJsLibraries(module, testServices, configuration)
val (dependencies, builtIns) = loadResolvedLibraries(libraries, configuration.languageVersionSettings, testServices)
val fir2IrConfiguration = Fir2IrConfiguration(
languageVersionSettings = configuration.languageVersionSettings,
linkViaSignatures = false
)
return Fir2IrConverter.createModuleFragmentWithSignaturesIfNeeded(
session, scopeSession, firFiles.toList(),
languageVersionSettings,
fir2IrExtensions,
Fir2IrConfiguration(linkViaSignatures = false),
fir2IrConfiguration,
JsManglerIr, IrFactoryImpl,
Fir2IrVisibilityConverter.Default,
Fir2IrJvmSpecialAnnotationSymbolProvider(), // TODO: replace with appropriate (probably empty) implementation
@@ -304,8 +304,10 @@ open class FirFrontendFacade(
val enablePluginPhases = FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES in module.directives
val firAnalyzerFacade = FirAnalyzerFacade(
moduleBasedSession,
module.languageVersionSettings,
Fir2IrConfiguration(linkViaSignatures = module.targetBackend == TargetBackend.JVM_IR_SERIALIZE),
Fir2IrConfiguration(
languageVersionSettings = module.languageVersionSettings,
linkViaSignatures = module.targetBackend == TargetBackend.JVM_IR_SERIALIZE
),
ktFiles,
lightTreeFiles,
IrGenerationExtension.getInstances(project),