From a5620454fa2fef926b4ca35b95fdb46a44506211 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Mon, 29 May 2017 16:08:23 +0300
Subject: [PATCH] Minor: use IntrinsicMethods.INTRINSICS_CLASS_NAME where
 appropriate

---
 .../codegen/optimization/boxing/BoxingInterpreter.kt       | 3 ++-
 .../boxing/RedundantBoxingMethodTransformer.kt             | 3 ++-
 .../nullCheck/RedundantNullCheckMethodTransformer.kt       | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
index b67f38266a0..f7411fea30f 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.kt
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.codegen.optimization.boxing
 import com.google.common.collect.ImmutableSet
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.codegen.RangeCodegenUtil
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter
 import org.jetbrains.kotlin.codegen.optimization.common.StrictBasicValue
 import org.jetbrains.kotlin.name.FqName
@@ -228,7 +229,7 @@ fun areSameTypedBoxedValues(values: List<BasicValue>): Boolean {
 fun AbstractInsnNode.isAreEqualIntrinsic() =
         isMethodInsnWith(Opcodes.INVOKESTATIC) {
             name == "areEqual" &&
-            owner == "kotlin/jvm/internal/Intrinsics" &&
+            owner == IntrinsicMethods.INTRINSICS_CLASS_NAME &&
             desc == "(Ljava/lang/Object;Ljava/lang/Object;)Z"
         }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt
index 00d5917e59b..9989a3365d3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen.optimization.boxing
 
 import com.intellij.openapi.util.Pair
 import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import org.jetbrains.kotlin.codegen.optimization.common.StrictBasicValue
 import org.jetbrains.kotlin.codegen.optimization.common.*
 import org.jetbrains.kotlin.codegen.optimization.fixStack.peek
@@ -455,7 +456,7 @@ class RedundantBoxingMethodTransformer : MethodTransformer() {
 
                 else -> {
                     // Can't fuse with branching instruction. Use Intrinsics#compare(int, int).
-                    set(insn, MethodInsnNode(Opcodes.INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "compare", "(II)I", false))
+                    set(insn, MethodInsnNode(Opcodes.INVOKESTATIC, IntrinsicMethods.INTRINSICS_CLASS_NAME, "compare", "(II)I", false))
                 }
             }
         }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt
index 745d905a80b..13111ce8bc5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/nullCheck/RedundantNullCheckMethodTransformer.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen.optimization.nullCheck
 
 import org.jetbrains.kotlin.codegen.coroutines.withInstructionAdapter
 import org.jetbrains.kotlin.codegen.inline.ReifiedTypeInliner
+import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods
 import org.jetbrains.kotlin.codegen.optimization.DeadCodeEliminationMethodTransformer
 import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter
 import org.jetbrains.kotlin.codegen.optimization.common.StrictBasicValue
@@ -403,21 +404,21 @@ internal fun AbstractInsnNode.isInstanceOfOrNullCheck() =
 
 internal fun AbstractInsnNode.isCheckParameterIsNotNull() =
         isInsn<MethodInsnNode>(Opcodes.INVOKESTATIC) {
-            owner == "kotlin/jvm/internal/Intrinsics" &&
+            owner == IntrinsicMethods.INTRINSICS_CLASS_NAME &&
             name == "checkParameterIsNotNull" &&
             desc == "(Ljava/lang/Object;Ljava/lang/String;)V"
         }
 
 internal fun AbstractInsnNode.isCheckExpressionValueIsNotNull() =
         isInsn<MethodInsnNode>(Opcodes.INVOKESTATIC) {
-            owner == "kotlin/jvm/internal/Intrinsics" &&
+            owner == IntrinsicMethods.INTRINSICS_CLASS_NAME &&
             name == "checkExpressionValueIsNotNull" &&
             desc == "(Ljava/lang/Object;Ljava/lang/String;)V"
         }
 
 internal fun AbstractInsnNode.isThrowNpeIntrinsic() =
         isInsn<MethodInsnNode>(Opcodes.INVOKESTATIC) {
-            owner == "kotlin/jvm/internal/Intrinsics" &&
+            owner == IntrinsicMethods.INTRINSICS_CLASS_NAME &&
             name == "throwNpe" &&
             desc == "()V"
         }