From fc874e72b1a31b1570c254d76852427727032b0e Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 5 Aug 2020 11:12:47 +0300
Subject: [PATCH] [FIR2IR] Initialize components a bit earlier to prevent
 lateinit errors

---
 .../src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 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 5ffa6773c0e..855df290fbc 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
@@ -243,9 +243,6 @@ class Fir2IrConverter(
             // Necessary call to generate built-in IR classes
             externalDependenciesGenerator.generateUnboundSymbolsAsDependencies()
             classifierStorage.preCacheBuiltinClasses()
-            for (firFile in firFiles) {
-                converter.processClassHeaders(firFile)
-            }
             val fakeOverrideGenerator = FakeOverrideGenerator(
                 session, scopeSession, classifierStorage, declarationStorage, conversionScope, FakeOverrideMode.NORMAL
             )
@@ -254,6 +251,9 @@ class Fir2IrConverter(
             val callGenerator = CallAndReferenceGenerator(components, fir2irVisitor, conversionScope)
             components.callGenerator = callGenerator
             declarationStorage.annotationGenerator = AnnotationGenerator(components)
+            for (firFile in firFiles) {
+                converter.processClassHeaders(firFile)
+            }
             for (firFile in firFiles) {
                 converter.processFileAndClassMembers(firFile)
             }