Revision: 8881
Author: [email protected]
Date: Wed Aug 10 07:10:56 2011
Log: Merge r8717 into 3.4 branch, fixing a
SplitConstantsInFullCompiler cctest.
Review URL: http://codereview.chromium.org/7606031
http://code.google.com/p/v8/source/detail?r=8881
Modified:
/branches/3.4
/branches/3.4/src/version.cc
/branches/3.4/test/cctest/test-compiler.cc
=======================================
--- /branches/3.4/src/version.cc Tue Aug 9 05:57:00 2011
+++ /branches/3.4/src/version.cc Wed Aug 10 07:10:56 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 4
#define BUILD_NUMBER 14
-#define PATCH_LEVEL 10
+#define PATCH_LEVEL 11
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.4/test/cctest/test-compiler.cc Mon Jul 4 07:01:31 2011
+++ /branches/3.4/test/cctest/test-compiler.cc Wed Aug 10 07:10:56 2011
@@ -377,7 +377,7 @@
while (pc < end) {
int num_const = d.ConstantPoolSizeAt(pc);
if (num_const >= 0) {
- pc += num_const * kPointerSize;
+ pc += (num_const + 1) * kPointerSize;
} else {
pc += d.InstructionDecode(decode_buffer, pc);
CHECK(strstr(decode_buffer.start(), "mov eax,0x178c29c") == NULL);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
