Reland "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

src/checks.h

Index: src/checks.h
diff --git a/src/checks.h b/src/checks.h
index 6ba64c1225f3c0211dc44126d9059b511d285402..54ac92649b5149959e90f07c5ab8bbcec2f266a7 100644
--- a/src/checks.h
+++ b/src/checks.h
@@ -5,6 +5,7 @@
 #ifndef V8_CHECKS_H_
 #define V8_CHECKS_H_
 
+#include "include/v8.h"
 #include "src/base/logging.h"
 
 namespace v8 {
@@ -14,8 +15,6 @@ template <class T> class Handle;
 
 namespace internal {
 
-intptr_t HeapObjectTagMask();
-
 #ifdef ENABLE_SLOW_DCHECKS
 #define SLOW_DCHECK(condition) \
   CHECK(!v8::internal::FLAG_enable_slow_asserts || (condition))
@@ -27,30 +26,11 @@ const bool FLAG_enable_slow_asserts = false;
 
 } }  // namespace v8::internal
 
+#define DCHECK_TAG_ALIGNED(address)             \
+  DCHECK((reinterpret_cast<intptr_t>(address) & \
+          ::v8::internal::kHeapObjectTagMask) == 0)
 
-void CheckNonEqualsHelper(const char* file, int line,
-                          const char* expected_source, double expected,
-                          const char* value_source, double value);
-
-void CheckEqualsHelper(const char* file, int line, const char* expected_source,
-                       double expected, const char* value_source, double value);
-
-void CheckNonEqualsHelper(const char* file, int line,
-                          const char* unexpected_source,
-                          v8::Handle<v8::Value> unexpected,
-                          const char* value_source,
-                          v8::Handle<v8::Value> value);
-
-void CheckEqualsHelper(const char* file,
-                       int line,
-                       const char* expected_source,
-                       v8::Handle<v8::Value> expected,
-                       const char* value_source,
-                       v8::Handle<v8::Value> value);
-
-#define DCHECK_TAG_ALIGNED(address) \
-  DCHECK((reinterpret_cast<intptr_t>(address) & HeapObjectTagMask()) == 0)
-
-#define DCHECK_SIZE_TAG_ALIGNED(size) DCHECK((size & HeapObjectTagMask()) == 0)
+#define DCHECK_SIZE_TAG_ALIGNED(size) \
+  DCHECK((size & ::v8::internal::kHeapObjectTagMask) == 0)
 
 #endif  // V8_CHECKS_H_