Revision: 8891
Author: [email protected]
Date: Thu Aug 11 02:08:33 2011
Log: Merge r8520 and 8717 into 3.2 branch, fixing a
SplitConstantsInFullCompiler cctest.
Review URL: http://codereview.chromium.org/7621006
http://code.google.com/p/v8/source/detail?r=8891
Modified:
/branches/3.2
/branches/3.2/src/version.cc
/branches/3.2/test/cctest/test-compiler.cc
=======================================
--- /branches/3.2/src/version.cc Thu Aug 4 10:37:58 2011
+++ /branches/3.2/src/version.cc Thu Aug 11 02:08:33 2011
@@ -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
=======================================
--- /branches/3.2/test/cctest/test-compiler.cc Mon May 16 06:00:59 2011
+++ /branches/3.2/test/cctest/test-compiler.cc Thu Aug 11 02:08:33 2011
@@ -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
