From 78f55583f0b5b2614c90278d5a68ae75db4c2a99 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 23 Jul 2015 17:30:54 +0300
Subject: [PATCH] Minor: CompileTimeConstantUtils, builtins are not needed to
 check for string type

---
 .../jetbrains/kotlin/resolve/CompileTimeConstantUtils.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java
index 14e7f2ee65c..e304e1a1638 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java
@@ -81,13 +81,12 @@ public class CompileTimeConstantUtils {
             return false;
         }
 
-        KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
         if (isEnumClass(typeDescriptor) ||
             isAnnotationClass(typeDescriptor) ||
             KotlinBuiltIns.isKClass(typeDescriptor) ||
             KotlinBuiltIns.isPrimitiveArray(parameterType) ||
             KotlinBuiltIns.isPrimitiveType(parameterType) ||
-            builtIns.getStringType().equals(parameterType)) {
+            KotlinBuiltIns.isString(parameterType)) {
                 return true;
         }
 
@@ -103,7 +102,7 @@ public class CompileTimeConstantUtils {
                     return isEnumClass(arrayTypeDescriptor) ||
                            isAnnotationClass(arrayTypeDescriptor) ||
                            KotlinBuiltIns.isKClass(arrayTypeDescriptor) ||
-                           builtIns.getStringType().equals(arrayType);
+                           KotlinBuiltIns.isString(arrayType);
                 }
             }
         }