Experimental: periodic merge of the bleeding_edge branch to the...

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 118 matching lines @@
 // Helper function used by the CHECK function when given pointer
 // arguments.  Should not be called directly.
 static inline void CheckEqualsHelper(const char* file,
                                      int line,
                                      const char* expected_source,
                                      void* expected,
                                      const char* value_source,
                                      void* value) {
   if (expected != value) {
     V8_Fatal(file, line,
-             "CHECK_EQ(%s, %s) failed\n#   Expected: %i\n#   Found: %i",
+             "CHECK_EQ(%s, %s) failed\n#   Expected: %p\n#   Found: %p",
              expected_source, value_source,
-             reinterpret_cast<int>(expected), reinterpret_cast<int>(value));
+             expected, value);
   }
 }
 
 
 static inline void CheckNonEqualsHelper(const char* file,
                                         int line,
                                         const char* expected_source,
                                         void* expected,
                                         const char* value_source,
                                         void* value) {
   if (expected == value) {
-    V8_Fatal(file, line, "CHECK_NE(%s, %s) failed\n#   Value: %i",
-             expected_source, value_source, reinterpret_cast<int>(value));
+    V8_Fatal(file, line, "CHECK_NE(%s, %s) failed\n#   Value: %p",
+             expected_source, value_source, value);
   }
 }
 
 
 // Helper function used by the CHECK function when given floating
 // point arguments.  Should not be called directly.
 static inline void CheckEqualsHelper(const char* file,
                                      int line,
                                      const char* expected_source,
                                      double expected,
@@ skipping 89 matching lines @@
 
 
 #define ASSERT_TAG_ALIGNED(address) \
   ASSERT((reinterpret_cast<int>(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_