Reviewers: danno, Description: Merge r8520 and 8717 into 3.2 branch, fixing a SplitConstantsInFullCompiler cctest.
Please review this at http://codereview.chromium.org/7621006/ SVN Base: http://v8.googlecode.com/svn/branches/3.2/ Affected files: M src/version.cc M test/cctest/test-compiler.cc Index: src/version.cc =================================================================== --- src/version.cc (revision 8888) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 2 #define BUILD_NUMBER 10 -#define PATCH_LEVEL 34 +#define PATCH_LEVEL 35 // 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 8888) +++ test/cctest/test-compiler.cc (working copy) @@ -375,10 +375,15 @@ v8::internal::EmbeddedVector<char, 128> decode_buffer; while (pc < end) { - pc += d.InstructionDecode(decode_buffer, pc); - CHECK(strstr(decode_buffer.start(), "mov eax,0x178c29c") == NULL); - CHECK(strstr(decode_buffer.start(), "push 0x178c29c") == NULL); - CHECK(strstr(decode_buffer.start(), "0x178c29c") == NULL); + int num_const = d.ConstantPoolSizeAt(pc); + if (num_const >= 0) { + pc += (num_const + 1) * kPointerSize; + } else { + pc += d.InstructionDecode(decode_buffer, pc); + CHECK(strstr(decode_buffer.start(), "mov eax,0x178c29c") == NULL); + CHECK(strstr(decode_buffer.start(), "push 0x178c29c") == NULL); + CHECK(strstr(decode_buffer.start(), "0x178c29c") == NULL); + } } } } -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
