Reviewers: danno, Description: Merge r8717 into 3.4 branch, fixing a SplitConstantsInFullCompiler cctest.
Please review this at http://codereview.chromium.org/7606031/ SVN Base: http://v8.googlecode.com/svn/branches/3.4/ Affected files: M src/version.cc M test/cctest/test-compiler.cc Index: src/version.cc =================================================================== --- src/version.cc (revision 8879) +++ src/version.cc (working copy) @@ -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 Index: test/cctest/test-compiler.cc =================================================================== --- test/cctest/test-compiler.cc (revision 8879) +++ test/cctest/test-compiler.cc (working copy) @@ -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
