Minor, delete ModuleContext#builtIns

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;
     }
 }

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 {

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)