Reviewers: Sven Panne,
Description:
Merged r11447 into 3.8 branch.
Add missing literal pool guards.
BUG=V8:2095
[email protected]
Please review this at https://chromiumcodereview.appspot.com/10239004/
SVN Base: https://v8.googlecode.com/svn/branches/3.8
Affected files:
M src/arm/full-codegen-arm.cc
M src/version.cc
Index: src/arm/full-codegen-arm.cc
diff --git a/src/arm/full-codegen-arm.cc b/src/arm/full-codegen-arm.cc
index
6654263989e82501ff86d2f1096061d4de82dd68..8dfa20fb527242937901a5cb4844922e4d27fe25
100644
--- a/src/arm/full-codegen-arm.cc
+++ b/src/arm/full-codegen-arm.cc
@@ -69,6 +69,7 @@ class JumpPatchSite BASE_EMBEDDED {
// the inlined smi code.
void EmitJumpIfNotSmi(Register reg, Label* target) {
ASSERT(!patch_site_.is_bound() && !info_emitted_);
+ Assembler::BlockConstPoolScope block_const_pool(masm_);
__ bind(&patch_site_);
__ cmp(reg, Operand(reg));
// Don't use b(al, ...) as that might emit the constant pool right
after the
@@ -81,6 +82,7 @@ class JumpPatchSite BASE_EMBEDDED {
// the inlined smi code.
void EmitJumpIfSmi(Register reg, Label* target) {
ASSERT(!patch_site_.is_bound() && !info_emitted_);
+ Assembler::BlockConstPoolScope block_const_pool(masm_);
__ bind(&patch_site_);
__ cmp(reg, Operand(reg));
__ b(ne, target); // Never taken before patched.
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
064a380fe4bed6a410cea0e639bef6e40e4384be..61f7dfb4e773b285022c9d8c2039a649259829d0
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 8
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 19
+#define PATCH_LEVEL 20
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
