Reviewers: jochen (slow),
Description:
Version 3.30.33.13 (cherry-pick)
Merged 13449b66231b323468487ed1525b516ff6c489df
ARM: check immediate overflow in branch and mov_label_offset in release
mode to
catch crashes earlier.
BUG=chromium:440913
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/821213002/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+5, -5 lines):
M src/arm/assembler-arm.cc
M src/version.cc
Index: src/arm/assembler-arm.cc
diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
index
17bf4f93ac7b7a5cf054f7afeadf06b8af3ee245..c7b91c58493efee7381a43ac5724695afa6f9825
100644
--- a/src/arm/assembler-arm.cc
+++ b/src/arm/assembler-arm.cc
@@ -1338,7 +1338,7 @@ int Assembler::branch_offset(Label* L, bool
jump_elimination_allowed) {
void Assembler::b(int branch_offset, Condition cond) {
DCHECK((branch_offset & 3) == 0);
int imm24 = branch_offset >> 2;
- DCHECK(is_int24(imm24));
+ CHECK(is_int24(imm24));
emit(cond | B27 | B25 | (imm24 & kImm24Mask));
if (cond == al) {
@@ -1352,7 +1352,7 @@ void Assembler::bl(int branch_offset, Condition cond)
{
positions_recorder()->WriteRecordedPositions();
DCHECK((branch_offset & 3) == 0);
int imm24 = branch_offset >> 2;
- DCHECK(is_int24(imm24));
+ CHECK(is_int24(imm24));
emit(cond | B27 | B25 | B24 | (imm24 & kImm24Mask));
}
@@ -1362,7 +1362,7 @@ void Assembler::blx(int branch_offset) { // v5 and
above
DCHECK((branch_offset & 1) == 0);
int h = ((branch_offset & 2) >> 1)*B24;
int imm24 = branch_offset >> 2;
- DCHECK(is_int24(imm24));
+ CHECK(is_int24(imm24));
emit(kSpecialCondition | B27 | B25 | h | (imm24 & kImm24Mask));
}
@@ -1504,7 +1504,7 @@ void Assembler::mov_label_offset(Register dst, Label*
label) {
//
// When the label gets bound: target_at extracts the link and
target_at_put
// patches the instructions.
- DCHECK(is_uint24(link));
+ CHECK(is_uint24(link));
BlockConstPoolScope block_const_pool(this);
emit(link);
nop(dst.code());
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
63f7b62076c797a0f582834126c500c86925140f..81515d1aea34f4f91dce80d63b7b13dc0e8e65bc
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 30
#define BUILD_NUMBER 33
-#define PATCH_LEVEL 12
+#define PATCH_LEVEL 13
// 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
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
