From 240baa64a5f84d3783f40e8c6b9741dbd9e196fb Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 20 Jul 2020 12:35:20 +0300
Subject: [PATCH] Fir2IrConverter: initialize call generator earlier to avoid
 lateinit err

---
 .../org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
index e6e8946cc94..0f3de9b67d2 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
@@ -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)