Fir2IrConverter: initialize call generator earlier to avoid lateinit err

2020-07-20 12:35:20 +03:00
parent 2b52988f1b
commit 240baa64a5
1 changed files with 4 additions and 4 deletions
@@ -238,14 +238,14 @@ class Fir2IrConverter(
                session, scopeSession, classifierStorage, declarationStorage, conversionScope, fakeOverrideMode
            )
            components.fakeOverrideGenerator = fakeOverrideGenerator
-            for (firFile in firFiles) {
-                converter.processFileAndClassMembers(firFile)
-            }
-
            val fir2irVisitor = Fir2IrVisitor(converter, components, conversionScope)
            val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
            components.callGenerator = callGenerator
            declarationStorage.annotationGenerator = AnnotationGenerator(components)
+            for (firFile in firFiles) {
+                converter.processFileAndClassMembers(firFile)
+            }
+
            for (firFile in firFiles) {
                val irFile = firFile.accept(fir2irVisitor, null) as IrFile
                val fileEntry = sourceManager.getOrCreateFileEntry(firFile.psi as KtFile)