From b79881848ff9b18dfdd2bb125f310522fcbeb27e Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 22 Sep 2015 17:49:48 +0300
Subject: [PATCH] jvm-backend, cli: Replace some usages of
 KotlinBuiltIns.getInstance() by JvmPlatform.builtIns

---
 .../backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java   | 3 ++-
 .../kotlin/cli/jvm/compiler/CommandLineScriptUtils.java       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
index 8a8d15e42d2..a2dbd1b44fe 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java
@@ -23,13 +23,14 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject;
 
 public class FieldInfo {
 
-    private static final CompanionObjectMapping COMPANION_OBJECT_MAPPING = new CompanionObjectMapping(KotlinBuiltIns.getInstance());
+    private static final CompanionObjectMapping COMPANION_OBJECT_MAPPING = new CompanionObjectMapping(JvmPlatform.INSTANCE$.getBuiltIns());
 
     @NotNull
     public static FieldInfo createForSingleton(@NotNull ClassDescriptor classDescriptor, @NotNull JetTypeMapper typeMapper) {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java
index a8de1a4421b..bfcd3dbaabc 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.kotlin.types.JetType;
 
 import java.util.Collections;
@@ -33,7 +34,8 @@ public class CommandLineScriptUtils {
     }
 
     public static List<AnalyzerScriptParameter> scriptParameters() {
-        JetType arrayOfStrings = KotlinBuiltIns.getInstance().getArrayType(INVARIANT, KotlinBuiltIns.getInstance().getStringType());
+        KotlinBuiltIns builtIns = JvmPlatform.INSTANCE$.getBuiltIns();
+        JetType arrayOfStrings = builtIns.getArrayType(INVARIANT, builtIns.getStringType());
         AnalyzerScriptParameter argsParameter = new AnalyzerScriptParameter(ARGS_NAME, arrayOfStrings);
         return Collections.singletonList(argsParameter);
     }