azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JVM, JVM_IR: KT-42281 proper array->primitive coercion

Browse Source
This commit is contained in:
Dmitry Petrov
2020-11-20 12:42:48 +03:00
parent e59c8e0a5c
commit b495fd542f
11 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+2 -2
View File
@@ -672,8 +672,8 @@ public abstract class StackValue {
box(fromType, toType, v);
}
}
else if (fromType.getSort() == Type.OBJECT) {
//toType is primitive here
else if (fromType.getSort() == Type.OBJECT || fromType.getSort() == Type.ARRAY) {
// here toType is primitive and fromType is reference (object or array)
Type unboxedType = unboxPrimitiveTypeOrNull(fromType);
if (unboxedType != null) {
unbox(fromType, unboxedType, v);
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -20795,6 +20795,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+5 -2
View File
@@ -420,8 +420,11 @@ class ExpressionCodegen(
visitStatementContainer(expression, data)
override fun visitCall(expression: IrCall, data: BlockInfo): PromisedValue {
classCodegen.context.irIntrinsics.getIntrinsic(expression.symbol)
?.invoke(expression, this, data)?.let { return it }
val intrinsic = classCodegen.context.irIntrinsics.getIntrinsic(expression.symbol)
if (intrinsic != null) {
intrinsic.invoke(expression, this, data)
?.let { return it }
}
val callee = expression.symbol.owner
require(callee.parent is IrClass) { "Unhandled intrinsic in ExpressionCodegen: ${callee.render()}" }
compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt
Vendored
+6
View File
@@ -0,0 +1,6 @@
// WITH_RUNTIME
// KJS_WITH_FULL_RUNTIME
fun box(): String {
return if (run { 123 != intArrayOf() as Any }) "OK" else "Fail"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -22566,6 +22566,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -22566,6 +22566,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -20795,6 +20795,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -17101,6 +17101,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -17101,6 +17101,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -17206,6 +17206,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -10647,6 +10647,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/intEqualsNullableIntWithSmartCasts.kt");
}
@TestMetadata("kt42281.kt")
public void testKt42281() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/kt42281.kt");
}
@TestMetadata("objectWithAsymmetricEqualsEqPrimitive.kt")
public void testObjectWithAsymmetricEqualsEqPrimitive() throws Exception {
runTest("compiler/testData/codegen/box/primitiveTypes/equalityWithObject/objectWithAsymmetricEqualsEqPrimitive.kt");