From 8b2164e2b8cdab75c066823cef31ddda874a3e16 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 12 May 2017 14:20:58 +0200
Subject: [PATCH] Code clean after transformation

---
 .../kotlin/codegen/inline/InliningContext.kt     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
index 8fdd517d7be..000896b7883 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.kt
@@ -29,10 +29,15 @@ open class InliningContext(
         val isInliningLambda: Boolean,
         val classRegeneration: Boolean
 ) {
-    val internalNameToAnonymousObjectTransformationInfo: MutableMap<String, AnonymousObjectTransformationInfo> = HashMap()
+    val internalNameToAnonymousObjectTransformationInfo = hashMapOf<String, AnonymousObjectTransformationInfo>()
 
     var isContinuation: Boolean = false
 
+    val isRoot: Boolean = parent == null
+
+    val root: RootInliningContext
+        get() = if (isRoot) this as RootInliningContext else parent!!.root
+
     fun subInline(generator: NameGenerator): InliningContext {
         return subInline(generator, emptyMap(), isInliningLambda)
     }
@@ -70,16 +75,9 @@ open class InliningContext(
         )
     }
 
-    val isRoot: Boolean
-        get() = parent == null
-
-    val root: RootInliningContext
-        get() = if (isRoot) this as RootInliningContext else parent!!.root
-
     open val callSiteInfo: InlineCallSiteInfo
         get() {
-            assert(parent != null) { "At least root context should return proper value" }
-            return parent!!.callSiteInfo
+            return parent?.callSiteInfo ?: throw AssertionError("At least root context should return proper value")
         }
 
     fun findAnonymousObjectTransformationInfo(internalName: String): AnonymousObjectTransformationInfo? {