From f604b776f6b734cc40f1dada5ed18919a30a89a5 Mon Sep 17 00:00:00 2001
From: Anton Bannykh <Anton.Bannykh@jetbrains.com>
Date: Fri, 24 Jan 2020 14:06:55 +0300
Subject: [PATCH] Support Lateinit lowering changes

(cherry picked from commit 621a377b4c669f4838de76d3a592e288ed962df2)
---
 .../jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt
index 5a16222dda4..01263d3c6f3 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLoweringPhases.kt
@@ -112,8 +112,12 @@ internal val lowerAfterInlinePhase = makeKonanModuleOpPhase(
 
 /* IrFile phases */
 
-internal val lateinitPhase = makeKonanFileLoweringPhase(
-        ::LateinitLowering,
+internal val lateinitPhase = makeKonanFileOpPhase(
+        { context, irFile ->
+            NullableFieldsForLateinitCreationLowering(context).lower(irFile)
+            NullableFieldsDeclarationLowering(context).lower(irFile)
+            LateinitUsageLowering(context).lower(irFile)
+        },
         name = "Lateinit",
         description = "Lateinit properties lowering",
         prerequisite = setOf(inlinePhase)