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

[FIR2IR] Initialize components a bit earlier to prevent lateinit errors

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-08-05 11:12:47 +03:00
parent 17b289fa00
commit fc874e72b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+3 -3
View File
@@ -243,9 +243,6 @@ class Fir2IrConverter(
// Necessary call to generate built-in IR classes // Necessary call to generate built-in IR classes
externalDependenciesGenerator.generateUnboundSymbolsAsDependencies() externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
classifierStorage.preCacheBuiltinClasses() classifierStorage.preCacheBuiltinClasses()
for (firFile in firFiles) {
converter.processClassHeaders(firFile)
}
val fakeOverrideGenerator = FakeOverrideGenerator( val fakeOverrideGenerator = FakeOverrideGenerator(
session, scopeSession, classifierStorage, declarationStorage, conversionScope, FakeOverrideMode.NORMAL session, scopeSession, classifierStorage, declarationStorage, conversionScope, FakeOverrideMode.NORMAL
) )
@@ -254,6 +251,9 @@ class Fir2IrConverter(
val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope) val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
components.callGenerator = callGenerator components.callGenerator = callGenerator
declarationStorage.annotationGenerator = AnnotationGenerator(components) declarationStorage.annotationGenerator = AnnotationGenerator(components)
for (firFile in firFiles) {
converter.processClassHeaders(firFile)
}
for (firFile in firFiles) { for (firFile in firFiles) {
converter.processFileAndClassMembers(firFile) converter.processFileAndClassMembers(firFile)
} }