commit 0f6784737882199197796b67b99e5f1ded383bee
author Ian Rogers <irogers@google.com> Mon Mar 10 16:18:37 2014 -0700
committer Ian Rogers <irogers@google.com> Mon Mar 10 18:02:07 2014 -0700
tree 139888bdfad743c50e800ad46b9aec97ae3415d3
parent 73a471336a9515fa7fdc5859e3c481ec451237a5

Unify 64bit int constant definitions.

LL and ULL prefixes are word size dependent, use the INT64_C and UINT64_C
macros instead.

Change-Id: I5b70027651898814fc0b3e9e22a18a1047e76cb9

compiler/jni/jni_compiler_test.cc

diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc
index 3a51d87..df5afa2 100644
--- a/compiler/jni/jni_compiler_test.cc
+++ b/compiler/jni/jni_compiler_test.cc
@@ -252,8 +252,8 @@
                reinterpret_cast<void*>(&Java_MyClassNatives_fooJJ));
 
   EXPECT_EQ(0, gJava_MyClassNatives_fooJJ_calls);
-  jlong a = 0x1234567890ABCDEFll;
-  jlong b = 0xFEDCBA0987654321ll;
+  jlong a = INT64_C(0x1234567890ABCDEF);
+  jlong b = INT64_C(0xFEDCBA0987654321);
   jlong result = env_->CallNonvirtualLongMethod(jobj_, jklass_, jmethod_, a, b);
   EXPECT_EQ(a - b, result);
   EXPECT_EQ(1, gJava_MyClassNatives_fooJJ_calls);
@@ -681,7 +681,7 @@
 jboolean my_casi(JNIEnv* env, jobject unsafe, jobject obj, jlong offset, jint expected, jint newval) {
   EXPECT_TRUE(env->IsSameObject(JniCompilerTest::jobj_, unsafe));
   EXPECT_TRUE(env->IsSameObject(JniCompilerTest::jobj_, obj));
-  EXPECT_EQ(0x12345678ABCDEF88ll, offset);
+  EXPECT_EQ(INT64_C(0x12345678ABCDEF88), offset);
   EXPECT_EQ(static_cast<jint>(0xCAFEF00D), expected);
   EXPECT_EQ(static_cast<jint>(0xEBADF00D), newval);
   return JNI_TRUE;
@@ -691,7 +691,8 @@
   TEST_DISABLED_FOR_PORTABLE();
   SetUpForTest(false, "compareAndSwapInt", "(Ljava/lang/Object;JII)Z",
                reinterpret_cast<void*>(&my_casi));
-  jboolean result = env_->CallBooleanMethod(jobj_, jmethod_, jobj_, 0x12345678ABCDEF88ll, 0xCAFEF00D, 0xEBADF00D);
+  jboolean result = env_->CallBooleanMethod(jobj_, jmethod_, jobj_, INT64_C(0x12345678ABCDEF88),
+                                            0xCAFEF00D, 0xEBADF00D);
   EXPECT_EQ(result, JNI_TRUE);
 }
 
@@ -709,7 +710,7 @@
   SetUpForTest(true, "getText", "(JLjava/lang/Object;JLjava/lang/Object;)I",
                reinterpret_cast<void*>(&my_gettext));
   jint result = env_->CallStaticIntMethod(jklass_, jmethod_, 0x12345678ABCDEF88ll, jobj_,
-                                          0x7FEDCBA987654321ll, jobj_);
+                                          INT64_C(0x7FEDCBA987654321), jobj_);
   EXPECT_EQ(result, 42);
 }
 
@@ -827,7 +828,7 @@
   ScopedObjectAccess soa(Thread::Current());
   EXPECT_EQ(1U, Thread::Current()->NumStackReferences());*/
   EXPECT_EQ(i1, 1234);
-  EXPECT_EQ(l1, 5678);
+  EXPECT_EQ(l1, INT64_C(0x12345678ABCDEF0));
 }
 
 TEST_F(JniCompilerTest, CheckParameterAlign) {
@@ -835,7 +836,7 @@
   SetUpForTest(false, "checkParameterAlign", "(IJ)V",
                reinterpret_cast<void*>(&Java_MyClassNatives_checkParameterAlign));
 
-  env_->CallNonvirtualVoidMethod(jobj_, jklass_, jmethod_, 1234, 5678LLU);
+  env_->CallNonvirtualVoidMethod(jobj_, jklass_, jmethod_, 1234, INT64_C(0x12345678ABCDEF0));
 }
 
 void Java_MyClassNatives_maxParamNumber(JNIEnv* env, jobject thisObj,