From e1158b1cb271ef8e3a65168f014922216bdc4914 Mon Sep 17 00:00:00 2001
From: Nikolay Lunyak <nikolay.lunyak@jetbrains.com>
Date: Tue, 18 Apr 2023 09:20:38 +0300
Subject: [PATCH] [FIR] Don't load unneeded things

It's confusing to stop at breakpoints
related to these loadings when they aren't
actually used.
---
 .../configuration/JsEnvironmentConfigurator.kt         | 10 ++++++----
 .../org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt   |  3 ++-
 .../kotlin/types/error/ErrorModuleDescriptor.kt        |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
index 9a269e6c939..d706a53abf2 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt
@@ -70,10 +70,12 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
             }
         }
 
-        private val METADATA_CACHE = (JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path ->
-            KotlinJavascriptMetadataUtils.loadMetadata(path).map { metadata ->
-                val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
-                JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
+        private val METADATA_CACHE by lazy {
+            (JsConfig.JS_STDLIB + JsConfig.JS_KOTLIN_TEST).flatMap { path ->
+                KotlinJavascriptMetadataUtils.loadMetadata(path).map { metadata ->
+                    val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
+                    JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
+                }
             }
         }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt
index 1878a674ca9..1eb9cb62f90 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt
@@ -27,7 +27,8 @@ class DefaultBuiltIns(loadBuiltInsFromCurrentClassLoader: Boolean = true) : Kotl
 
     companion object {
         @JvmStatic
-        val Instance: DefaultBuiltIns =
+        val Instance: DefaultBuiltIns by lazy {
             DefaultBuiltIns()
+        }
     }
 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorModuleDescriptor.kt
index 34d33837feb..f0a54228a2e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorModuleDescriptor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorModuleDescriptor.kt
@@ -20,7 +20,7 @@ object ErrorModuleDescriptor : ModuleDescriptor {
     override val expectedByModules: List<ModuleDescriptor> = emptyList()
     override val allExpectedByModules: Set<ModuleDescriptor> = emptySet()
     override val annotations: Annotations get() = Annotations.EMPTY
-    override val builtIns: KotlinBuiltIns = DefaultBuiltIns.Instance
+    override val builtIns: KotlinBuiltIns by lazy { DefaultBuiltIns.Instance }
     override val isValid: Boolean = false
 
     override fun <T> getCapability(capability: ModuleCapability<T>): T? = null