Revision: 11450
Author: [email protected]
Date: Thu Apr 26 05:01:49 2012
Log: Merged r11447 into 3.9 branch.
Add missing literal pool guards.
BUG=V8:2095
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10230003
http://code.google.com/p/v8/source/detail?r=11450
Modified:
/branches/3.9/src/arm/full-codegen-arm.cc
/branches/3.9/src/version.cc
=======================================
--- /branches/3.9/src/arm/full-codegen-arm.cc Fri Mar 23 08:11:57 2012
+++ /branches/3.9/src/arm/full-codegen-arm.cc Thu Apr 26 05:01:49 2012
@@ -70,6 +70,7 @@
// 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
@@ -82,6 +83,7 @@
// 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.
=======================================
--- /branches/3.9/src/version.cc Mon Apr 23 02:53:17 2012
+++ /branches/3.9/src/version.cc Thu Apr 26 05:01:49 2012
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 9
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 16
+#define PATCH_LEVEL 17
// 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
