From ad0070ed8a6c1468a5321194150e27fefd6c479d Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 27 Feb 2020 13:24:35 +0300 Subject: [PATCH] KT-37059 Support 'String?.plus(Any?)' in JVM_IR --- .../jvm/intrinsics/IrIntrinsicMethods.kt | 6 ++++ .../backend/jvm/intrinsics/StringPlus.kt | 30 +++++++++++++++++++ .../codegen/box/intrinsics/nullPlusString.kt | 15 ++++++++++ .../codegen/BlackBoxCodegenTestGenerated.java | 5 ++++ .../LightAnalysisModeTestGenerated.java | 5 ++++ .../ir/FirBlackBoxCodegenTestGenerated.java | 5 ++++ .../ir/IrBlackBoxCodegenTestGenerated.java | 5 ++++ .../IrJsCodegenBoxTestGenerated.java | 5 ++++ .../semantics/JsCodegenBoxTestGenerated.java | 5 ++++ 9 files changed, 81 insertions(+) create mode 100644 compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt create mode 100644 compiler/testData/codegen/box/intrinsics/nullPlusString.kt diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt index a81dd7e9d5c..6f4e2d77fd9 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/IrIntrinsicMethods.kt @@ -91,6 +91,12 @@ class IrIntrinsicMethods(val irBuiltIns: IrBuiltIns, val symbols: JvmSymbols) { "enumValueOf", listOf(KotlinBuiltIns.FQ_NAMES.string.toSafe()) ) to EnumValueOf, + Key( + KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, + KotlinBuiltIns.FQ_NAMES.string.toSafe(), + "plus", + listOf(KotlinBuiltIns.FQ_NAMES.any.toSafe()) + ) to StringPlus, irBuiltIns.eqeqSymbol.toKey()!! to Equals(KtTokens.EQEQ), irBuiltIns.eqeqeqSymbol.toKey()!! to Equals(KtTokens.EQEQEQ), irBuiltIns.ieee754equalsFunByOperandType[irBuiltIns.floatClass]!!.toKey()!! to Ieee754Equals(Type.FLOAT_TYPE), diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt new file mode 100644 index 00000000000..92b081ba441 --- /dev/null +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/StringPlus.kt @@ -0,0 +1,30 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.backend.jvm.intrinsics + +import org.jetbrains.kotlin.backend.jvm.JvmBackendContext +import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods +import org.jetbrains.kotlin.ir.expressions.IrFunctionAccessExpression +import org.jetbrains.kotlin.resolve.jvm.AsmTypes +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature +import org.jetbrains.org.objectweb.asm.Type + +object StringPlus : IntrinsicMethod() { + + override fun toCallable( + expression: IrFunctionAccessExpression, + signature: JvmMethodSignature, + context: JvmBackendContext + ): IrIntrinsicFunction = + IrIntrinsicFunction.create(expression, signature, context, listOf(AsmTypes.JAVA_STRING_TYPE, AsmTypes.OBJECT_TYPE)) { + it.invokestatic( + IntrinsicMethods.INTRINSICS_CLASS_NAME, + "stringPlus", + Type.getMethodDescriptor(AsmTypes.JAVA_STRING_TYPE, AsmTypes.JAVA_STRING_TYPE, AsmTypes.OBJECT_TYPE), + false + ) + } +} \ No newline at end of file diff --git a/compiler/testData/codegen/box/intrinsics/nullPlusString.kt b/compiler/testData/codegen/box/intrinsics/nullPlusString.kt new file mode 100644 index 00000000000..82b9dc33354 --- /dev/null +++ b/compiler/testData/codegen/box/intrinsics/nullPlusString.kt @@ -0,0 +1,15 @@ +fun splus(s: String?, x: Any?) = s + x + +fun box(): String { + val test1 = null + "" + if (test1 != "null") throw AssertionError("Fail: $test1") + + val ns: String? = "abc" + val test2 = ns + "" + if (test2 != "abc") throw AssertionError("Fail: $test2") + + val test3 = splus(null, null) + if (test3 != "nullnull") throw AssertionError("Fail: $test3") + + return "OK" +} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 03f2d8e0766..b80f1041534 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -14554,6 +14554,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 16533cdb539..7301c4c9f06 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -14554,6 +14554,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java index bfe6eae8c9e..b4d527d7904 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java @@ -13424,6 +13424,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java index 42138f47631..6051f8c37c4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java @@ -13424,6 +13424,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java index 7a5e939402a..5cf63f80546 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java @@ -11624,6 +11624,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest { runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index af13da6b9ad..995819e38c0 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -11689,6 +11689,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { runTest("compiler/testData/codegen/box/intrinsics/nonShortCircuitAnd.kt"); } + @TestMetadata("nullPlusString.kt") + public void testNullPlusString() throws Exception { + runTest("compiler/testData/codegen/box/intrinsics/nullPlusString.kt"); + } + @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { runTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt");