Reviewers: Mads Ager, Message: Both the current V8, and V8 with this revision, compile on WIN64. Haven't checked the other platforms, but they should be fine. Will check the other platforms.
Description: Remove special CheckEquals function for intptr_t on X64 platform. Please review this at http://codereview.chromium.org/190004 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/checks.h M src/objects.h Index: src/objects.h =================================================================== --- src/objects.h (revision 2812) +++ src/objects.h (working copy) @@ -2634,8 +2634,8 @@ // 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; } Index: src/checks.h =================================================================== --- src/checks.h (revision 2812) +++ src/checks.h (working copy) @@ -95,39 +95,7 @@ } } -#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. static inline void CheckEqualsHelper(const char* file, --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
