Introduce JvmBuiltIns and DefaultBuiltIns, different instances of KotlinBuiltIns

Make KotlinBuiltIns an abstract class
JsPlatform has DefaultBuiltIns

core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java

@@ -44,7 +44,7 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
     private final Map<ClassDescriptor, ClassDescriptor> readOnlyToMutable = new HashMap<ClassDescriptor, ClassDescriptor>();
 
     private JavaToKotlinClassMap() {
-        KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
+        KotlinBuiltIns builtIns = JvmBuiltIns.getInstance();
 
         add(Object.class, builtIns.getAny());
         add(String.class, builtIns.getString());

core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.platform
+
+import org.jetbrains.kotlin.builtins.BuiltInsInitializer
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
+
+class JvmBuiltIns private constructor() : KotlinBuiltIns() {
+    companion object {
+        private val initializer = BuiltInsInitializer {
+            JvmBuiltIns()
+        }
+
+        @JvmStatic
+        val Instance: KotlinBuiltIns
+            get() = initializer.get()
+    }
+}

core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt

@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.load.kotlin.reflect
 
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.ReflectionTypes
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleParameters
@@ -33,6 +32,7 @@ import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver
 import org.jetbrains.kotlin.load.kotlin.JavaClassDataFinder
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
+import org.jetbrains.kotlin.platform.JvmBuiltIns
 import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.kotlin.serialization.deserialization.LocalClassResolver
@@ -44,7 +44,7 @@ public class RuntimeModuleData private constructor(public val deserialization: D
 
     companion object {
         public fun create(classLoader: ClassLoader): RuntimeModuleData {
-            val builtIns = KotlinBuiltIns.getInstance()
+            val builtIns = JvmBuiltIns.Instance
             val storageManager = LockBasedStorageManager()
             val module = ModuleDescriptorImpl(Name.special("<runtime module for $classLoader>"), storageManager,
                                               ModuleParameters(listOf(), JavaToKotlinClassMap.INSTANCE), builtIns)

core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsInitializer.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.builtins
+
+import org.jetbrains.kotlin.utils.sure
+
+public class BuiltInsInitializer<T : KotlinBuiltIns>(
+        private val constructor: () -> T
+) {
+    @Volatile private var instance: T? = null
+
+    @Volatile private var initializing: Boolean = false
+
+    private var initializationFailed: Throwable? = null
+
+    @Synchronized private fun initialize() {
+        if (instance == null) {
+            if (initializationFailed != null) {
+                throw IllegalStateException(
+                        "Built-in library initialization failed previously: " + initializationFailed!!, initializationFailed)
+            }
+            if (initializing) {
+                throw IllegalStateException("Built-in library initialization loop")
+            }
+            initializing = true
+            try {
+                instance = constructor()
+            }
+            catch (e: Throwable) {
+                initializationFailed = e
+                throw IllegalStateException("Built-in library initialization failed. " + "Please ensure you have kotlin-runtime.jar in the classpath: " + e, e)
+            }
+            finally {
+                initializing = false
+            }
+        }
+    }
+
+    fun get(): T {
+        if (initializing) {
+            synchronized (this) {
+                return instance.sure {
+                    "Built-ins are not initialized (note: We are under the same lock as initializing and instance)"
+                }
+            }
+        }
+        if (instance == null) {
+            initialize()
+        }
+        return instance!!
+    }
+}

core/descriptors/src/org/jetbrains/kotlin/builtins/DefaultBuiltIns.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.builtins
+
+class DefaultBuiltIns private constructor() : KotlinBuiltIns() {
+    companion object {
+        private val initializer = BuiltInsInitializer {
+            DefaultBuiltIns()
+        }
+
+        @JvmStatic
+        val Instance: DefaultBuiltIns
+            get() = initializer.get()
+    }
+}

core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java

@@ -43,7 +43,7 @@ import static kotlin.KotlinPackage.*;
 import static org.jetbrains.kotlin.builtins.PrimitiveType.*;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
 
-public class KotlinBuiltIns {
+public abstract class KotlinBuiltIns {
     public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier("kotlin");
     public static final FqName BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME);
     public static final FqName ANNOTATION_PACKAGE_FQ_NAME = BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier("annotation"));
@@ -54,54 +54,6 @@ public class KotlinBuiltIns {
             BuiltinsPackage.getKOTLIN_REFLECT_FQ_NAME()
     );
 
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-    private static volatile KotlinBuiltIns instance = null;
-
-    private static volatile boolean initializing;
-    private static Throwable initializationFailed;
-
-    private static synchronized void initialize() {
-        if (instance == null) {
-            if (initializationFailed != null) {
-                throw new IllegalStateException(
-                        "Built-in library initialization failed previously: " + initializationFailed, initializationFailed
-                );
-            }
-            if (initializing) {
-                throw new IllegalStateException("Built-in library initialization loop");
-            }
-            initializing = true;
-            try {
-                instance = new KotlinBuiltIns();
-            }
-            catch (Throwable e) {
-                initializationFailed = e;
-                throw new IllegalStateException("Built-in library initialization failed. " +
-                                                "Please ensure you have kotlin-runtime.jar in the classpath: " + e, e);
-            }
-            finally {
-                initializing = false;
-            }
-        }
-    }
-
-    @NotNull
-    public static KotlinBuiltIns getInstance() {
-        if (initializing) {
-            synchronized (KotlinBuiltIns.class) {
-                assert instance != null : "Built-ins are not initialized (note: We are under the same lock as initializing and instance)";
-                return instance;
-            }
-        }
-        if (instance == null) {
-            initialize();
-        }
-        return instance;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
     private final ModuleDescriptorImpl builtInsModule;
     private final BuiltinsPackageFragment builtinsPackageFragment;
     private final BuiltinsPackageFragment annotationPackageFragment;
@@ -112,7 +64,7 @@ public class KotlinBuiltIns {
 
     public static final FqNames FQ_NAMES = new FqNames();
 
-    private KotlinBuiltIns() {
+    protected KotlinBuiltIns() {
         LockBasedStorageManager storageManager = new LockBasedStorageManager();
         builtInsModule = new ModuleDescriptorImpl(
                 Name.special("<built-ins module>"), storageManager, ModuleParameters.Empty.INSTANCE$, this