From c9d9a8220d07e892934c5e5b30af152bb41cd05e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 21 Jul 2017 15:37:26 +0300 Subject: [PATCH] Minor: use IntrinsicMethods.INTRINSICS_CLASS_NAME where appropriate --- compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java | 2 +- .../src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index f94bad7e647..f51b269cfe3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -717,7 +717,7 @@ public class AsmUtil { if (innerType.getSort() == Type.OBJECT || innerType.getSort() == Type.ARRAY) { v.dup(); v.visitLdcInsn(runtimeAssertionInfo.getMessage()); - v.invokestatic("kotlin/jvm/internal/Intrinsics", "checkExpressionValueIsNotNull", + v.invokestatic(IntrinsicMethods.INTRINSICS_CLASS_NAME, "checkExpressionValueIsNotNull", "(Ljava/lang/Object;Ljava/lang/String;)V", false); } StackValue.coerce(innerType, type, v); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt index dd256a277bc..643ea25d48f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.CallableMethod class StringPlus : IntrinsicMethod() { override fun toCallable(method: CallableMethod): Callable = createIntrinsicCallable(method) { - it.invokestatic("kotlin/jvm/internal/Intrinsics", "stringPlus", + it.invokestatic(IntrinsicMethods.INTRINSICS_CLASS_NAME, "stringPlus", "(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;", false) } }