Revert "Add support for long-to-int in the optimizing compiler."
This reverts commit 647b96f29cb81832e698f863884fdba06674c9de.
Change-Id: I552f23585463c676acbd547521b4d3ee5c0342eb
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index e95dbb8..8418ab0 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -922,11 +922,6 @@
break;
}
- case Instruction::LONG_TO_INT: {
- Conversion_12x(instruction, Primitive::kPrimLong, Primitive::kPrimInt);
- break;
- }
-
case Instruction::ADD_INT: {
Binop_23x<HAdd>(instruction, Primitive::kPrimInt);
break;
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc
index 7f3ebf4..467c2a6 100644
--- a/compiler/optimizing/code_generator_arm.cc
+++ b/compiler/optimizing/code_generator_arm.cc
@@ -22,10 +22,9 @@
#include "mirror/art_method.h"
#include "mirror/class.h"
#include "thread.h"
-#include "utils.h"
+#include "utils/assembler.h"
#include "utils/arm/assembler_arm.h"
#include "utils/arm/managed_register_arm.h"
-#include "utils/assembler.h"
#include "utils/stack_checks.h"
namespace art {
@@ -1334,26 +1333,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1377,6 +1356,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1396,35 +1376,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- DCHECK(out.IsRegister());
- if (in.IsRegisterPair()) {
- __ Mov(out.As<Register>(), in.AsRegisterPairLow<Register>());
- } else if (in.IsDoubleStackSlot()) {
- __ LoadFromOffset(kLoadWord, out.As<Register>(), SP, in.GetStackIndex());
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ LoadImmediate(out.As<Register>(),
- Low32Bits(in.GetConstant()->AsLongConstant()->GetValue()));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1453,6 +1404,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 4706274..d66180b 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -22,7 +22,6 @@
#include "mirror/art_method.h"
#include "mirror/class.h"
#include "thread.h"
-#include "utils.h"
#include "utils/assembler.h"
#include "utils/stack_checks.h"
#include "utils/x86/assembler_x86.h"
@@ -1262,26 +1261,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1305,6 +1284,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1324,34 +1304,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- if (in.IsRegisterPair()) {
- __ movl(out.As<Register>(), in.AsRegisterPairLow<Register>());
- } else if (in.IsDoubleStackSlot()) {
- __ movl(out.As<Register>(), Address(ESP, in.GetStackIndex()));
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ movl(out.As<Register>(),
- Immediate(Low32Bits(in.GetConstant()->AsLongConstant()->GetValue())));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1377,6 +1329,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc
index 304a008..e09b6ca 100644
--- a/compiler/optimizing/code_generator_x86_64.cc
+++ b/compiler/optimizing/code_generator_x86_64.cc
@@ -23,7 +23,6 @@
#include "mirror/class.h"
#include "mirror/object_reference.h"
#include "thread.h"
-#include "utils.h"
#include "utils/assembler.h"
#include "utils/stack_checks.h"
#include "utils/x86_64/assembler_x86_64.h"
@@ -1260,26 +1259,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- locations->SetInAt(0, Location::Any());
- locations->SetOut(Location::RequiresRegister(), Location::kNoOutputOverlap);
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
case Primitive::kPrimByte:
@@ -1305,6 +1284,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
@@ -1324,35 +1304,6 @@
Primitive::Type result_type = conversion->GetResultType();
Primitive::Type input_type = conversion->GetInputType();
switch (result_type) {
- case Primitive::kPrimInt:
- switch (input_type) {
- case Primitive::kPrimLong:
- // long-to-int conversion.
- if (in.IsRegister()) {
- __ movl(out.As<CpuRegister>(), in.As<CpuRegister>());
- } else if (in.IsDoubleStackSlot()) {
- __ movl(out.As<CpuRegister>(),
- Address(CpuRegister(RSP), in.GetStackIndex()));
- } else {
- DCHECK(in.IsConstant());
- DCHECK(in.GetConstant()->IsLongConstant());
- __ movl(out.As<CpuRegister>(),
- Immediate(Low32Bits(in.GetConstant()->AsLongConstant()->GetValue())));
- }
- break;
-
- case Primitive::kPrimFloat:
- case Primitive::kPrimDouble:
- LOG(FATAL) << "Type conversion from " << input_type
- << " to " << result_type << " not yet implemented";
- break;
-
- default:
- LOG(FATAL) << "Unexpected type conversion from " << input_type
- << " to " << result_type;
- }
- break;
-
case Primitive::kPrimLong:
switch (input_type) {
DCHECK(out.IsRegister());
@@ -1377,6 +1328,7 @@
}
break;
+ case Primitive::kPrimInt:
case Primitive::kPrimFloat:
case Primitive::kPrimDouble:
LOG(FATAL) << "Type conversion from " << input_type
diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc
index bdf58ed..ecee443 100644
--- a/compiler/optimizing/codegen_test.cc
+++ b/compiler/optimizing/codegen_test.cc
@@ -362,23 +362,6 @@
#undef NOT_LONG_TEST
-TEST(CodegenTest, IntToLongOfLongToInt) {
- const int64_t input = INT64_C(4294967296); // 2^32
- const uint16_t word0 = Low16Bits(Low32Bits(input)); // LSW.
- const uint16_t word1 = High16Bits(Low32Bits(input));
- const uint16_t word2 = Low16Bits(High32Bits(input));
- const uint16_t word3 = High16Bits(High32Bits(input)); // MSW.
- const uint16_t data[] = FIVE_REGISTERS_CODE_ITEM(
- Instruction::CONST_WIDE | 0 << 8, word0, word1, word2, word3,
- Instruction::CONST_WIDE | 2 << 8, 1, 0, 0, 0,
- Instruction::ADD_LONG | 0, 0 << 8 | 2, // v0 <- 2^32 + 1
- Instruction::LONG_TO_INT | 4 << 8 | 0 << 12,
- Instruction::INT_TO_LONG | 2 << 8 | 4 << 12,
- Instruction::RETURN_WIDE | 2 << 8);
-
- TestCodeLong(data, true, 1);
-}
-
TEST(CodegenTest, ReturnAdd1) {
const uint16_t data[] = TWO_REGISTERS_CODE_ITEM(
Instruction::CONST_4 | 3 << 12 | 0,
diff --git a/test/415-optimizing-arith-neg/src/Main.java b/test/415-optimizing-arith-neg/src/Main.java
index d9f8bcf..e2850ca 100644
--- a/test/415-optimizing-arith-neg/src/Main.java
+++ b/test/415-optimizing-arith-neg/src/Main.java
@@ -71,8 +71,8 @@
assertEquals(0, $opt$NegInt(0));
assertEquals(51, $opt$NegInt(-51));
assertEquals(-51, $opt$NegInt(51));
- assertEquals(2147483647, $opt$NegInt(-2147483647)); // -(2^31 - 1)
- assertEquals(-2147483647, $opt$NegInt(2147483647)); // 2^31 - 1
+ assertEquals(2147483647, $opt$NegInt(-2147483647)); // (2^31 - 1)
+ assertEquals(-2147483647, $opt$NegInt(2147483647)); // -(2^31 - 1)
// From the Java 7 SE Edition specification:
// http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.15.4
//
@@ -98,13 +98,13 @@
assertEquals(51L, $opt$NegLong(-51L));
assertEquals(-51L, $opt$NegLong(51L));
- assertEquals(2147483647L, $opt$NegLong(-2147483647L)); // -(2^31 - 1)
- assertEquals(-2147483647L, $opt$NegLong(2147483647L)); // (2^31 - 1)
- assertEquals(2147483648L, $opt$NegLong(-2147483648L)); // -(2^31)
- assertEquals(-2147483648L, $opt$NegLong(2147483648L)); // 2^31
+ assertEquals(2147483647L, $opt$NegLong(-2147483647L)); // (2^31 - 1)
+ assertEquals(-2147483647L, $opt$NegLong(2147483647L)); // -(2^31 - 1)
+ assertEquals(2147483648L, $opt$NegLong(-2147483648L)); // 2^31
+ assertEquals(-2147483648L, $opt$NegLong(2147483648L)); // -(2^31)
- assertEquals(9223372036854775807L, $opt$NegLong(-9223372036854775807L)); // -(2^63 - 1)
- assertEquals(-9223372036854775807L, $opt$NegLong(9223372036854775807L)); // 2^63 - 1
+ assertEquals(9223372036854775807L, $opt$NegLong(-9223372036854775807L)); // (2^63 - 1)
+ assertEquals(-9223372036854775807L, $opt$NegLong(9223372036854775807L)); // -(2^63 - 1)
// See remark regarding the negation of the maximum negative
// (long) value in negInt().
assertEquals(-9223372036854775808L, $opt$NegLong(-9223372036854775808L)); // -(2^63)
diff --git a/test/416-optimizing-arith-not/src/Main.java b/test/416-optimizing-arith-not/src/Main.java
index 44c7d3c..26e206c 100644
--- a/test/416-optimizing-arith-not/src/Main.java
+++ b/test/416-optimizing-arith-not/src/Main.java
@@ -40,10 +40,10 @@
expectEquals(0, smaliNotInt(-1));
expectEquals(-1, smaliNotInt(0));
expectEquals(-2, smaliNotInt(1));
- expectEquals(2147483647, smaliNotInt(-2147483648)); // -(2^31)
- expectEquals(2147483646, smaliNotInt(-2147483647)); // -(2^31 - 1)
- expectEquals(-2147483647, smaliNotInt(2147483646)); // 2^31 - 2
- expectEquals(-2147483648, smaliNotInt(2147483647)); // 2^31 - 1
+ expectEquals(2147483647, smaliNotInt(-2147483648)); // (2^31) - 1
+ expectEquals(2147483646, smaliNotInt(-2147483647)); // (2^31) - 2
+ expectEquals(-2147483647, smaliNotInt(2147483646)); // -(2^31) - 1
+ expectEquals(-2147483648, smaliNotInt(2147483647)); // -(2^31)
}
private static void notLong() throws Exception {
@@ -51,14 +51,14 @@
expectEquals(0L, smaliNotLong(-1L));
expectEquals(-1L, smaliNotLong(0L));
expectEquals(-2L, smaliNotLong(1L));
- expectEquals(2147483647L, smaliNotLong(-2147483648L)); // -(2^31)
- expectEquals(2147483646L, smaliNotLong(-2147483647L)); // -(2^31 - 1)
- expectEquals(-2147483647L, smaliNotLong(2147483646L)); // 2^31 - 2
- expectEquals(-2147483648L, smaliNotLong(2147483647L)); // 2^31 - 1
- expectEquals(9223372036854775807L, smaliNotLong(-9223372036854775808L)); // -(2^63)
- expectEquals(9223372036854775806L, smaliNotLong(-9223372036854775807L)); // -(2^63 - 1)
- expectEquals(-9223372036854775807L, smaliNotLong(9223372036854775806L)); // 2^63 - 2
- expectEquals(-9223372036854775808L, smaliNotLong(9223372036854775807L)); // 2^63 - 1
+ expectEquals(2147483647L, smaliNotLong(-2147483648L)); // (2^31) - 1
+ expectEquals(2147483646L, smaliNotLong(-2147483647L)); // (2^31) - 2
+ expectEquals(-2147483647L, smaliNotLong(2147483646L)); // -(2^31) - 1
+ expectEquals(-2147483648L, smaliNotLong(2147483647L)); // -(2^31)
+ expectEquals(9223372036854775807L, smaliNotLong(-9223372036854775808L)); // (2^63) - 1
+ expectEquals(9223372036854775806L, smaliNotLong(-9223372036854775807L)); // (2^63) - 2
+ expectEquals(-9223372036854775807L, smaliNotLong(9223372036854775806L)); // -(2^63) - 1
+ expectEquals(-9223372036854775808L, smaliNotLong(9223372036854775807L)); // -(2^63)
}
// Wrappers around methods located in file not.smali.
diff --git a/test/422-type-conversion/src/Main.java b/test/422-type-conversion/src/Main.java
index a4232ed..d61f255 100644
--- a/test/422-type-conversion/src/Main.java
+++ b/test/422-type-conversion/src/Main.java
@@ -18,13 +18,7 @@
// it does compile the method.
public class Main {
- public static void assertIntEquals(int expected, int result) {
- if (expected != result) {
- throw new Error("Expected: " + expected + ", found: " + result);
- }
- }
-
- public static void assertLongEquals(long expected, long result) {
+ public static void assertEquals(long expected, long result) {
if (expected != result) {
throw new Error("Expected: " + expected + ", found: " + result);
}
@@ -32,96 +26,63 @@
public static void main(String[] args) {
byteToLong();
+ charToLong();
shortToLong();
intToLong();
- charToLong();
-
- longToInt();
}
private static void byteToLong() {
- assertLongEquals(1L, $opt$ByteToLong((byte)1));
- assertLongEquals(0L, $opt$ByteToLong((byte)0));
- assertLongEquals(-1L, $opt$ByteToLong((byte)-1));
- assertLongEquals(51L, $opt$ByteToLong((byte)51));
- assertLongEquals(-51L, $opt$ByteToLong((byte)-51));
- assertLongEquals(127L, $opt$ByteToLong((byte)127)); // 2^7 - 1
- assertLongEquals(-127L, $opt$ByteToLong((byte)-127)); // -(2^7 - 1)
- assertLongEquals(-128L, $opt$ByteToLong((byte)-128)); // -(2^7)
+ assertEquals(1L, $opt$ByteToLong((byte)1));
+ assertEquals(0L, $opt$ByteToLong((byte)0));
+ assertEquals(-1L, $opt$ByteToLong((byte)-1));
+ assertEquals(51L, $opt$ByteToLong((byte)51));
+ assertEquals(-51L, $opt$ByteToLong((byte)-51));
+ assertEquals(127L, $opt$ByteToLong((byte)127)); // (2^7) - 1
+ assertEquals(-127L, $opt$ByteToLong((byte)-127)); // -(2^7) - 1
+ assertEquals(-128L, $opt$ByteToLong((byte)-128)); // -(2^7)
}
private static void shortToLong() {
- assertLongEquals(1L, $opt$ShortToLong((short)1));
- assertLongEquals(0L, $opt$ShortToLong((short)0));
- assertLongEquals(-1L, $opt$ShortToLong((short)-1));
- assertLongEquals(51L, $opt$ShortToLong((short)51));
- assertLongEquals(-51L, $opt$ShortToLong((short)-51));
- assertLongEquals(32767L, $opt$ShortToLong((short)32767)); // 2^15 - 1
- assertLongEquals(-32767L, $opt$ShortToLong((short)-32767)); // -(2^15 - 1)
- assertLongEquals(-32768L, $opt$ShortToLong((short)-32768)); // -(2^15)
+ assertEquals(1L, $opt$ShortToLong((short)1));
+ assertEquals(0L, $opt$ShortToLong((short)0));
+ assertEquals(-1L, $opt$ShortToLong((short)-1));
+ assertEquals(51L, $opt$ShortToLong((short)51));
+ assertEquals(-51L, $opt$ShortToLong((short)-51));
+ assertEquals(32767L, $opt$ShortToLong((short)32767)); // (2^15) - 1
+ assertEquals(-32767L, $opt$ShortToLong((short)-32767)); // -(2^15) - 1
+ assertEquals(-32768L, $opt$ShortToLong((short)-32768)); // -(2^15)
}
private static void intToLong() {
- assertLongEquals(1L, $opt$IntToLong(1));
- assertLongEquals(0L, $opt$IntToLong(0));
- assertLongEquals(-1L, $opt$IntToLong(-1));
- assertLongEquals(51L, $opt$IntToLong(51));
- assertLongEquals(-51L, $opt$IntToLong(-51));
- assertLongEquals(2147483647L, $opt$IntToLong(2147483647)); // 2^31 - 1
- assertLongEquals(-2147483647L, $opt$IntToLong(-2147483647)); // -(2^31 - 1)
- assertLongEquals(-2147483648L, $opt$IntToLong(-2147483648)); // -(2^31)
+ assertEquals(1L, $opt$IntToLong(1));
+ assertEquals(0L, $opt$IntToLong(0));
+ assertEquals(-1L, $opt$IntToLong(-1));
+ assertEquals(51L, $opt$IntToLong(51));
+ assertEquals(-51L, $opt$IntToLong(-51));
+ assertEquals(2147483647L, $opt$IntToLong(2147483647)); // (2^31) - 1
+ assertEquals(-2147483647L, $opt$IntToLong(-2147483647)); // -(2^31) - 1
+ assertEquals(-2147483648L, $opt$IntToLong(-2147483648)); // -(2^31)
}
private static void charToLong() {
- assertLongEquals(1L, $opt$CharToLong((char)1));
- assertLongEquals(0L, $opt$CharToLong((char)0));
- assertLongEquals(51L, $opt$CharToLong((char)51));
- assertLongEquals(32767L, $opt$CharToLong((char)32767)); // 2^15 - 1
- assertLongEquals(65535L, $opt$CharToLong((char)65535)); // 2^16 - 1
+ assertEquals(1L, $opt$CharToLong((char)1));
+ assertEquals(0L, $opt$CharToLong((char)0));
+ assertEquals(51L, $opt$CharToLong((char)51));
+ assertEquals(32767L, $opt$CharToLong((char)32767)); // (2^15) - 1
+ assertEquals(65535L, $opt$CharToLong((char)65535)); // (2^16) - 1
- assertLongEquals(0L, $opt$CharToLong('\u0000'));
- assertLongEquals(65535L, $opt$CharToLong('\uFFFF')); // 2^16 - 1
+ assertEquals(0L, $opt$CharToLong('\u0000'));
+ assertEquals(65535L, $opt$CharToLong('\uFFFF')); // (2^16) - 1
- assertLongEquals(65535L, $opt$CharToLong((char)-1));
- assertLongEquals(65485L, $opt$CharToLong((char)-51));
- assertLongEquals(32769L, $opt$CharToLong((char)-32767)); // -(2^15 - 1)
- assertLongEquals(32768L, $opt$CharToLong((char)-32768)); // -(2^15)
+ assertEquals(65535L, $opt$CharToLong((char)-1));
+ assertEquals(65485L, $opt$CharToLong((char)-51));
+ assertEquals(32769L, $opt$CharToLong((char)-32767)); // -(2^15) - 1
+ assertEquals(32768L, $opt$CharToLong((char)-32768)); // -(2^15)
}
- private static void longToInt() {
- assertIntEquals(1, $opt$LongToInt(1L));
- assertIntEquals(0, $opt$LongToInt(0L));
- assertIntEquals(-1, $opt$LongToInt(-1L));
- assertIntEquals(51, $opt$LongToInt(51L));
- assertIntEquals(-51, $opt$LongToInt(-51L));
- assertIntEquals(2147483647, $opt$LongToInt(2147483647L)); // 2^31 - 1
- assertIntEquals(-2147483647, $opt$LongToInt(-2147483647L)); // -(2^31 - 1)
- assertIntEquals(-2147483648, $opt$LongToInt(-2147483648L)); // -(2^31)
- assertIntEquals(-2147483648, $opt$LongToInt(2147483648L)); // (2^31)
- assertIntEquals(2147483647, $opt$LongToInt(-2147483649L)); // -(2^31 + 1)
- assertIntEquals(-1, $opt$LongToInt(9223372036854775807L)); // 2^63 - 1
- assertIntEquals(1, $opt$LongToInt(-9223372036854775807L)); // -(2^63 - 1)
- assertIntEquals(0, $opt$LongToInt(-9223372036854775808L)); // -(2^63)
-
- assertIntEquals(42, $opt$LongLiteralToInt());
-
- // Ensure long-to-int conversions truncates values as expected.
- assertLongEquals(1L, $opt$IntToLong($opt$LongToInt(4294967297L))); // 2^32 + 1
- assertLongEquals(0L, $opt$IntToLong($opt$LongToInt(4294967296L))); // 2^32
- assertLongEquals(-1L, $opt$IntToLong($opt$LongToInt(4294967295L))); // 2^32 - 1
- assertLongEquals(0L, $opt$IntToLong($opt$LongToInt(0L)));
- assertLongEquals(1L, $opt$IntToLong($opt$LongToInt(-4294967295L))); // -(2^32 - 1)
- assertLongEquals(0L, $opt$IntToLong($opt$LongToInt(-4294967296L))); // -(2^32)
- assertLongEquals(-1, $opt$IntToLong($opt$LongToInt(-4294967297L))); // -(2^32 + 1)
- }
-
- // These methods produce int-to-long Dex instructions.
+ // All these methods produce an int-to-long Dex instruction.
static long $opt$ByteToLong(byte a) { return a; }
static long $opt$ShortToLong(short a) { return a; }
static long $opt$IntToLong(int a) { return a; }
static long $opt$CharToLong(int a) { return a; }
-
- // These methods produce long-to-int Dex instructions.
- static int $opt$LongToInt(long a){ return (int)a; }
- static int $opt$LongLiteralToInt(){ return (int)42L; }
}