Reviewers: Kevin Millikin, Message: Let's try this again. This seems to work on both Linux and Mac (x64).
Description: Merge r3525 to trunk. Please review this at http://codereview.chromium.org/519008 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/version.cc M src/x64/fast-codegen-x64.cc Index: src/x64/fast-codegen-x64.cc =================================================================== --- src/x64/fast-codegen-x64.cc (revision 3523) +++ src/x64/fast-codegen-x64.cc (working copy) @@ -1678,7 +1678,7 @@ void FastCodeGenerator::StoreToFrameField(int frame_offset, Register value) { - ASSERT_EQ(POINTER_SIZE_ALIGN(frame_offset), frame_offset); + ASSERT(IsAligned(frame_offset, kPointerSize)); __ movq(Operand(rbp, frame_offset), value); } Index: src/version.cc =================================================================== --- src/version.cc (revision 3523) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 0 #define BUILD_NUMBER 5 -#define PATCH_LEVEL 3 +#define PATCH_LEVEL 4 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
