Revision: 3523
Author: [email protected]
Date: Mon Dec 28 00:32:17 2009
Log: Merge r3522 to trunk.
Review URL: http://codereview.chromium.org/518018
http://code.google.com/p/v8/source/detail?r=3523
Modified:
/trunk/src/version.cc
/trunk/src/x64/fast-codegen-x64.cc
=======================================
--- /trunk/src/version.cc Mon Dec 21 07:20:30 2009
+++ /trunk/src/version.cc Mon Dec 28 00:32:17 2009
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 0
#define BUILD_NUMBER 5
-#define PATCH_LEVEL 2
+#define PATCH_LEVEL 3
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
=======================================
--- /trunk/src/x64/fast-codegen-x64.cc Fri Dec 18 00:56:33 2009
+++ /trunk/src/x64/fast-codegen-x64.cc Mon Dec 28 00:32:17 2009
@@ -1678,8 +1678,7 @@
void FastCodeGenerator::StoreToFrameField(int frame_offset, Register
value) {
- ASSERT_EQ(POINTER_SIZE_ALIGN(frame_offset),
- static_cast<intptr_t>(frame_offset));
+ ASSERT_EQ(POINTER_SIZE_ALIGN(frame_offset), frame_offset);
__ movq(Operand(rbp, frame_offset), value);
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
