From 1d6abc32bc7547805bdba66656e6f82a3c604bc0 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 24 Sep 2016 18:10:55 +0300
Subject: [PATCH] Minor, delete ModuleContext#builtIns

---
 .../kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java    | 2 +-
 .../frontend/src/org/jetbrains/kotlin/context/context.kt   | 3 ---
 .../src/org/jetbrains/kotlin/frontend/di/injection.kt      | 7 +++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
index 88b01884d92..9d5f618201b 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
@@ -154,7 +154,7 @@ public enum TopDownAnalyzerFacadeForJVM {
                 projectContext, Name.special("<" + configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME) + ">"),
                 JvmPlatform.INSTANCE, builtIns
         );
-        context.setDependencies(context.getModule(), context.getBuiltIns().getBuiltInsModule());
+        context.setDependencies(context.getModule(), builtIns.getBuiltInsModule());
         return context;
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
index d66ae17af5c..2b58a0e71cb 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt
@@ -44,9 +44,6 @@ interface ModuleContext : ProjectContext {
 
     val platformToKotlinClassMap: PlatformToKotlinClassMap
         get() = module.platformToKotlinClassMap
-
-    val builtIns: KotlinBuiltIns
-        get() = module.builtIns
 }
 
 interface MutableModuleContext: ModuleContext {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
index c7f6dd6c40d..6eea22abc11 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
@@ -17,7 +17,10 @@
 package org.jetbrains.kotlin.frontend.di
 
 import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.container.*
+import org.jetbrains.kotlin.container.StorageComponentContainer
+import org.jetbrains.kotlin.container.get
+import org.jetbrains.kotlin.container.useImpl
+import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.context.LazyResolveToken
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
@@ -36,7 +39,7 @@ fun StorageComponentContainer.configureModule(
     useInstance(moduleContext.module)
     useInstance(moduleContext.project)
     useInstance(moduleContext.storageManager)
-    useInstance(moduleContext.builtIns)
+    useInstance(moduleContext.module.builtIns)
     useInstance(moduleContext.platformToKotlinClassMap)
 
     useInstance(platform)