azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR2IR] Minor: simplify code

Browse Source
This commit is contained in:
Ivan Kochurkin
2023-01-30 21:47:11 +01:00
committed by Space Team
parent 6bdd0edd6c
commit b25e460beb
2 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+8 -17
View File
@@ -453,15 +453,11 @@ class Fir2IrConverter(
val converter = Fir2IrConverter(moduleDescriptor, components) val converter = Fir2IrConverter(moduleDescriptor, components)
components.converter = converter components.converter = converter
components.classifierStorage = Fir2IrClassifierStorage(components, commonMemberStorage)
val classifierStorage = Fir2IrClassifierStorage(components, commonMemberStorage)
components.classifierStorage = classifierStorage
components.delegatedMemberGenerator = DelegatedMemberGenerator(components) components.delegatedMemberGenerator = DelegatedMemberGenerator(components)
val declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor, commonMemberStorage) components.declarationStorage = Fir2IrDeclarationStorage(components, moduleDescriptor, commonMemberStorage)
components.declarationStorage = declarationStorage
components.visibilityConverter = visibilityConverter components.visibilityConverter = visibilityConverter
val typeConverter = Fir2IrTypeConverter(components) components.typeConverter = Fir2IrTypeConverter(components)
components.typeConverter = typeConverter
val irBuiltIns = initializedIrBuiltIns ?: IrBuiltInsOverFir( val irBuiltIns = initializedIrBuiltIns ?: IrBuiltInsOverFir(
components, languageVersionSettings, moduleDescriptor, irMangler, components, languageVersionSettings, moduleDescriptor, irMangler,
languageVersionSettings.getFlag(AnalysisFlags.builtInsFromSources) || kotlinBuiltIns !== DefaultBuiltIns.Instance languageVersionSettings.getFlag(AnalysisFlags.builtInsFromSources) || kotlinBuiltIns !== DefaultBuiltIns.Instance
@@ -469,16 +465,11 @@ class Fir2IrConverter(
components.irBuiltIns = irBuiltIns components.irBuiltIns = irBuiltIns
val conversionScope = Fir2IrConversionScope() val conversionScope = Fir2IrConversionScope()
val fir2irVisitor = Fir2IrVisitor(components, conversionScope) val fir2irVisitor = Fir2IrVisitor(components, conversionScope)
val builtIns = Fir2IrBuiltIns(components, specialSymbolProvider) components.builtIns = Fir2IrBuiltIns(components, specialSymbolProvider)
val annotationGenerator = AnnotationGenerator(components) components.annotationGenerator = AnnotationGenerator(components)
components.builtIns = builtIns components.fakeOverrideGenerator = FakeOverrideGenerator(components, conversionScope)
components.annotationGenerator = annotationGenerator components.callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
val fakeOverrideGenerator = FakeOverrideGenerator(components, conversionScope) components.irProviders = listOf(FirIrProvider(components))
components.fakeOverrideGenerator = fakeOverrideGenerator
val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
components.callGenerator = callGenerator
val irProvider = FirIrProvider(components)
components.irProviders = listOf(irProvider)
fir2IrExtensions.registerDeclarations(commonMemberStorage.symbolTable) fir2IrExtensions.registerDeclarations(commonMemberStorage.symbolTable)
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt
+2 -10
View File
@@ -95,16 +95,8 @@ open class FirFrontendFacade(
) )
val targetPlatform = module.targetPlatform val targetPlatform = module.targetPlatform
val firOutputPartForDependsOnModules = mutableListOf<FirOutputPartForDependsOnModule>() val firOutputPartForDependsOnModules = sortedModules.map {
for (testModule in sortedModules) { analyze(it, moduleDataMap[it]!!, targetPlatform, projectEnvironment)
firOutputPartForDependsOnModules.add(
analyze(
testModule,
moduleDataMap[testModule]!!,
targetPlatform,
projectEnvironment
)
)
} }
return FirOutputArtifactImpl(firOutputPartForDependsOnModules) return FirOutputArtifactImpl(firOutputPartForDependsOnModules)