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

Generate widening cast for Byte and Short to Int

Browse Source
This commit is contained in:
Dmitry Petrov
2020-05-06 11:40:51 +03:00
parent 427973fe48
commit 3143b15a17
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/OperatorExpressionGenerator.kt
-3
View File
@@ -388,9 +388,6 @@ class OperatorExpressionGenerator(statementGenerator: StatementGenerator) : Stat
operandType == targetType || operandNNType == targetType -> operandType == targetType || operandNNType == targetType ->
this this
targetType.isInt() && (operandNNType.isShort() || operandNNType.isByte()) ->
this
// TODO: don't rely on originalKotlinType. // TODO: don't rely on originalKotlinType.
type.originalKotlinType!!.containsNull() -> type.originalKotlinType!!.containsNull() ->
safeCallOnDispatchReceiver(this@OperatorExpressionGenerator, startOffset, endOffset) { dispatchReceiver -> safeCallOnDispatchReceiver(this@OperatorExpressionGenerator, startOffset, endOffset) { dispatchReceiver ->
compiler/testData/codegen/bytecodeText/conditions/noBoxingForBoxedEqPrimitive.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND: JVM_IR
fun testBoolean1(a: Boolean?, b: Boolean) = a == b fun testBoolean1(a: Boolean?, b: Boolean) = a == b
fun testBoolean2(a: Boolean?, b: Boolean) = a != b fun testBoolean2(a: Boolean?, b: Boolean) = a != b
compiler/testData/codegen/bytecodeText/conditions/noBoxingForPrimitiveEqBoxed.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND: JVM_IR
fun testBoolean1(a: Boolean, b: Boolean?) = a == b fun testBoolean1(a: Boolean, b: Boolean?) = a == b
fun testBoolean2(a: Boolean, b: Boolean?) = a != b fun testBoolean2(a: Boolean, b: Boolean?) = a != b
compiler/testData/codegen/bytecodeText/intrinsicsCompare/byteSmartCast_after.kt
Vendored
+2
View File
@@ -1,4 +1,6 @@
// !LANGUAGE: +ProperIeee754Comparisons // !LANGUAGE: +ProperIeee754Comparisons
// IGNORE_BACKEND: JVM_IR
fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b
fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!! fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!!
compiler/testData/codegen/bytecodeText/intrinsicsCompare/byteSmartCast_before.kt
Vendored
+2
View File
@@ -1,4 +1,6 @@
// !LANGUAGE: -ProperIeee754Comparisons // !LANGUAGE: -ProperIeee754Comparisons
// IGNORE_BACKEND: JVM_IR
fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b fun equals3(a: Byte?, b: Byte?) = a != null && b != null && a == b
fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!! fun equals4(a: Byte?, b: Byte?) = if (a is Byte && b is Byte) a == b else null!!
compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_after.kt
Vendored
+2
View File
@@ -1,4 +1,6 @@
// !LANGUAGE: +ProperIeee754Comparisons // !LANGUAGE: +ProperIeee754Comparisons
// IGNORE_BACKEND: JVM_IR
fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b
fun equals4(a: Short?, b: Short?) = if (a is Short && b is Short) a == b else null!! fun equals4(a: Short?, b: Short?) = if (a is Short && b is Short) a == b else null!!
compiler/testData/codegen/bytecodeText/intrinsicsCompare/shortSmartCast_before.kt
Vendored
+2
View File
@@ -1,4 +1,6 @@
// !LANGUAGE: -ProperIeee754Comparisons // !LANGUAGE: -ProperIeee754Comparisons
// IGNORE_BACKEND: JVM_IR
fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b fun equals3(a: Short?, b: Short?) = a != null && b != null && a == b
fun equals4(a: Short?, b: Short?) = if (a is Short && b is Short) a == b else null!! fun equals4(a: Short?, b: Short?) = if (a is Short && b is Short) a == b else null!!