From 2edebc2c9cd41ed068c460428b04b861a185b909 Mon Sep 17 00:00:00 2001
From: "whesse@chromium.org"
 <whesse@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 8 Sep 2009 08:49:54 +0000
Subject: [PATCH] Remove special CheckEquals function for intptr_t on X64
 platform. Review URL: http://codereview.chromium.org/190004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@2842 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/checks.h           | 32 --------------------------------
 src/objects.h          |  4 ++--
 src/x64/codegen-x64.cc |  2 +-
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/checks.h b/src/checks.h
index 4ecbaf4cf4..b302e5beee 100644
--- a/src/checks.h
+++ b/src/checks.h
@@ -95,38 +95,6 @@ static inline void CheckNonEqualsHelper(const char* file,
   }
 }
 
-#ifdef V8_TARGET_ARCH_X64
-// Helper function used by the CHECK_EQ function when given intptr_t
-// arguments.  Should not be called directly.
-static inline void CheckEqualsHelper(const char* file,
-                                     int line,
-                                     const char* expected_source,
-                                     intptr_t expected,
-                                     const char* value_source,
-                                     intptr_t 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);
-  }
-}
-
-
-// Helper function used by the CHECK_NE function when given intptr_t
-// arguments.  Should not be called directly.
-static inline void CheckNonEqualsHelper(const char* file,
-                                        int line,
-                                        const char* unexpected_source,
-                                        intptr_t unexpected,
-                                        const char* value_source,
-                                        intptr_t value) {
-  if (unexpected == value) {
-    V8_Fatal(file, line, "CHECK_NE(%s, %s) failed\n#   Value: %i",
-             unexpected_source, value_source, value);
-  }
-}
-#endif  // V8_TARGET_ARCH_X64
-
 
 // Helper function used by the CHECK function when given string
 // arguments.  Should not be called directly.
diff --git a/src/objects.h b/src/objects.h
index 910c1d7e4e..bd8ca513ba 100644
--- a/src/objects.h
+++ b/src/objects.h
@@ -2634,8 +2634,8 @@ class Code: public HeapObject {
   // the layout of the code object into account.
   int ExecutableSize() {
     // Check that the assumptions about the layout of the code object holds.
-    ASSERT_EQ(instruction_start() - address(),
-              static_cast<intptr_t>(Code::kHeaderSize));
+    ASSERT_EQ(static_cast<int>(instruction_start() - address()),
+              Code::kHeaderSize);
     return instruction_size() + Code::kHeaderSize;
   }
 
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
index 8558afc52b..d7e15aaee7 100644
--- a/src/x64/codegen-x64.cc
+++ b/src/x64/codegen-x64.cc
@@ -6576,7 +6576,7 @@ void CompareStub::Generate(MacroAssembler* masm) {
         // One operand is a smi.
 
         // Check whether the non-smi is a heap number.
-        ASSERT_EQ(static_cast<intptr_t>(1), kSmiTagMask);
+        ASSERT_EQ(1, static_cast<int>(kSmiTagMask));
         // rcx still holds rax & kSmiTag, which is either zero or one.
         __ decq(rcx);  // If rax is a smi, all 1s, else all 0s.
         __ movq(rbx, rdx);