From 7d1b6f4bbb6260d5da3c14c66242bae23484099b Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 22 Sep 2015 19:36:28 +0300
Subject: [PATCH] GenerateOperationsMap uses builtIns from default platform

---
 .../generators/evaluate/GenerateOperationsMap.kt    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
index 89fd3379676..41be956c0d0 100644
--- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt
@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
+import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
 import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.utils.Printer
@@ -47,7 +49,7 @@ fun generate(): String {
     val unaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
     val binaryOperationsMap = arrayListOf<Pair<String, List<JetType>>>()
 
-    val builtIns = KotlinBuiltIns.getInstance()
+    val builtIns = TargetPlatform.Default.builtIns
     @Suppress("UNCHECKED_CAST")
     val allPrimitiveTypes = builtIns.getBuiltInsPackageScope().getDescriptors()
             .filter { it is ClassDescriptor && KotlinBuiltIns.isPrimitiveType(it.getDefaultType()) } as List<ClassDescriptor>
@@ -150,11 +152,10 @@ fun renderCheckBinaryOperation(name: String, params: List<JetType>): String {
 }
 
 private fun JetType.isIntegerType(): Boolean {
-    val builtIns = KotlinBuiltIns.getInstance()
-    return this == builtIns.getIntType() ||
-           this == builtIns.getShortType() ||
-           this == builtIns.getByteType() ||
-           this == builtIns.getLongType()
+    return KotlinBuiltIns.isInt(this) ||
+           KotlinBuiltIns.isShort(this) ||
+           KotlinBuiltIns.isByte(this) ||
+           KotlinBuiltIns.isLong(this)
 }