Add CHECK_INT64_EQ function to avoid operand size ambiguities.

src/checks.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 62 matching lines @@
 static inline void CheckEqualsHelper(const char* file, int line,
                                      const char* expected_source, int expected,
                                      const char* value_source, int value) {
   if (expected != value) {
     V8_Fatal(file, line,
              "CHECK_EQ(%s, %s) failed\n#   Expected: %i\n#   Found: %i",
              expected_source, value_source, expected, value);
   }
 }
 
-#if !V8_HOST_ARCH_64_BIT
-// Helper function used by the CHECK_EQ function when given int64_t
-// arguments.  Should not be called directly.
-static inline void CheckEqualsHelper(const char* file, int line,
-                                     const char* expected_source,
-                                     int64_t expected,
-                                     const char* value_source,
-                                     int64_t value) {
+// Helper function used by the CHECK_INT64_EQ function when given int64_t
+// arguments.  Should not be called directly.  We do not overload CHECK_EQ
+// with both 32-bit and 64-bit integers, because it causes ambiguity
+// with operands of mixed sizes.
+static inline void CheckInt64EqualsHelper(const char* file, int line,
+                                          const char* expected_source,
+                                          int64_t expected,
+                                          const char* value_source,
+                                          int64_t value) {
   if (expected != value) {
-    // Sorry, printing int64_t in a fanky hex way,
-    // that's our mother tongue after all :)
+    // Print int64_t values in hex, as two int32s,
+    // to avoid platform-dependencies.
     V8_Fatal(file, line,
              "CHECK_EQ(%s, %s) failed\n#"
              "   Expected: 0x%08x%08x\n#   Found: 0x%08x%08x",
              expected_source, value_source,
              uint32_t(expected >> 32), uint32_t(expected),
              uint32_t(value >> 32), uint32_t(value));
   }
 }
-#endif
 
 
 // Helper function used by the CHECK_NE function when given int
 // arguments.  Should not be called directly.
 static inline void CheckNonEqualsHelper(const char* file,
                                         int line,
                                         const char* unexpected_source,
                                         int unexpected,
                                         const char* value_source,
                                         int value) {
@@ skipping 113 matching lines @@
   #expected, expected, #value, value)
 
 
 #define CHECK_NE(unexpected, value) CheckNonEqualsHelper(__FILE__, __LINE__, \
   #unexpected, unexpected, #value, value)
 
 
 #define CHECK_GT(a, b) CHECK((a) > (b))
 #define CHECK_GE(a, b) CHECK((a) >= (b))
 
+#define CHECK_INT64_EQ(expected, value) CheckInt64EqualsHelper(__FILE__, \
+  __LINE__, #expected, expected, #value, value)
+
 
 // This is inspired by the static assertion facility in boost.  This
 // is pretty magical.  If it causes you trouble on a platform you may
 // find a fix in the boost code.
 template <bool> class StaticAssertion;
 template <> class StaticAssertion<true> { };
 // This macro joins two tokens.  If one of the tokens is a macro the
 // helper call causes it to be resolved before joining.
 #define SEMI_STATIC_JOIN(a, b) SEMI_STATIC_JOIN_HELPER(a, b)
 #define SEMI_STATIC_JOIN_HELPER(a, b) a##b
@@ skipping 29 matching lines @@
 
 
 #define ASSERT_TAG_ALIGNED(address) \
   ASSERT((reinterpret_cast<intptr_t>(address) & kHeapObjectTagMask) == 0)
 
 #define ASSERT_SIZE_TAG_ALIGNED(size) ASSERT((size & kHeapObjectTagMask) == 0)
 
 #define ASSERT_NOT_NULL(p)  ASSERT_NE(NULL, p)
 
 #endif  // V8_CHECKS_H_