Upgrade V8 to 7.0.276.40
Bug: 117554758
Bug: 117555811
Bug: 117556606
Bug: 117556220
Bug: 117607414
Bug: 117606285
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest
Test: atest proxy_resolver_v8_unittest
Change-Id: I2e02d994f107e64e4f465b4d8a02d4159a95240e
diff --git a/src/regexp/regexp-macro-assembler-irregexp.cc b/src/regexp/regexp-macro-assembler-irregexp.cc
index 3316c33..eb8d474 100644
--- a/src/regexp/regexp-macro-assembler-irregexp.cc
+++ b/src/regexp/regexp-macro-assembler-irregexp.cc
@@ -54,7 +54,7 @@
void RegExpMacroAssemblerIrregexp::EmitOrLink(Label* l) {
- if (l == NULL) l = &backtrack_;
+ if (l == nullptr) l = &backtrack_;
if (l->is_bound()) {
Emit32(l->pos());
} else {
@@ -69,8 +69,8 @@
void RegExpMacroAssemblerIrregexp::PopRegister(int register_index) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_POP_REGISTER, register_index);
}
@@ -78,16 +78,16 @@
void RegExpMacroAssemblerIrregexp::PushRegister(
int register_index,
StackCheckFlag check_stack_limit) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_PUSH_REGISTER, register_index);
}
void RegExpMacroAssemblerIrregexp::WriteCurrentPositionToRegister(
int register_index, int cp_offset) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_SET_REGISTER_TO_CP, register_index);
Emit32(cp_offset); // Current position offset.
}
@@ -103,24 +103,24 @@
void RegExpMacroAssemblerIrregexp::ReadCurrentPositionFromRegister(
int register_index) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_SET_CP_TO_REGISTER, register_index);
}
void RegExpMacroAssemblerIrregexp::WriteStackPointerToRegister(
int register_index) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_SET_REGISTER_TO_SP, register_index);
}
void RegExpMacroAssemblerIrregexp::ReadStackPointerFromRegister(
int register_index) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_SET_SP_TO_REGISTER, register_index);
}
@@ -132,16 +132,16 @@
void RegExpMacroAssemblerIrregexp::SetRegister(int register_index, int to) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_SET_REGISTER, register_index);
Emit32(to);
}
void RegExpMacroAssemblerIrregexp::AdvanceRegister(int register_index, int by) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_ADVANCE_REGISTER, register_index);
Emit32(by);
}
@@ -195,8 +195,8 @@
void RegExpMacroAssemblerIrregexp::AdvanceCurrentPosition(int by) {
- DCHECK(by >= kMinCPOffset);
- DCHECK(by <= kMaxCPOffset);
+ DCHECK_LE(kMinCPOffset, by);
+ DCHECK_GE(kMaxCPOffset, by);
advance_current_start_ = pc_;
advance_current_offset_ = by;
Emit(BC_ADVANCE_CP, by);
@@ -215,8 +215,8 @@
Label* on_failure,
bool check_bounds,
int characters) {
- DCHECK(cp_offset >= kMinCPOffset);
- DCHECK(cp_offset <= kMaxCPOffset);
+ DCHECK_LE(kMinCPOffset, cp_offset);
+ DCHECK_GE(kMaxCPOffset, cp_offset);
int bytecode;
if (check_bounds) {
if (characters == 4) {
@@ -224,7 +224,7 @@
} else if (characters == 2) {
bytecode = BC_LOAD_2_CURRENT_CHARS;
} else {
- DCHECK(characters == 1);
+ DCHECK_EQ(1, characters);
bytecode = BC_LOAD_CURRENT_CHAR;
}
} else {
@@ -233,7 +233,7 @@
} else if (characters == 2) {
bytecode = BC_LOAD_2_CURRENT_CHARS_UNCHECKED;
} else {
- DCHECK(characters == 1);
+ DCHECK_EQ(1, characters);
bytecode = BC_LOAD_CURRENT_CHAR_UNCHECKED;
}
}
@@ -373,8 +373,8 @@
void RegExpMacroAssemblerIrregexp::CheckNotBackReference(int start_reg,
bool read_backward,
Label* on_not_equal) {
- DCHECK(start_reg >= 0);
- DCHECK(start_reg <= kMaxRegister);
+ DCHECK_LE(0, start_reg);
+ DCHECK_GE(kMaxRegister, start_reg);
Emit(read_backward ? BC_CHECK_NOT_BACK_REF_BACKWARD : BC_CHECK_NOT_BACK_REF,
start_reg);
EmitOrLink(on_not_equal);
@@ -383,8 +383,8 @@
void RegExpMacroAssemblerIrregexp::CheckNotBackReferenceIgnoreCase(
int start_reg, bool read_backward, bool unicode, Label* on_not_equal) {
- DCHECK(start_reg >= 0);
- DCHECK(start_reg <= kMaxRegister);
+ DCHECK_LE(0, start_reg);
+ DCHECK_GE(kMaxRegister, start_reg);
Emit(read_backward ? (unicode ? BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE_BACKWARD
: BC_CHECK_NOT_BACK_REF_NO_CASE_BACKWARD)
: (unicode ? BC_CHECK_NOT_BACK_REF_NO_CASE_UNICODE
@@ -397,8 +397,8 @@
void RegExpMacroAssemblerIrregexp::IfRegisterLT(int register_index,
int comparand,
Label* on_less_than) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_CHECK_REGISTER_LT, register_index);
Emit32(comparand);
EmitOrLink(on_less_than);
@@ -408,8 +408,8 @@
void RegExpMacroAssemblerIrregexp::IfRegisterGE(int register_index,
int comparand,
Label* on_greater_or_equal) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_CHECK_REGISTER_GE, register_index);
Emit32(comparand);
EmitOrLink(on_greater_or_equal);
@@ -418,8 +418,8 @@
void RegExpMacroAssemblerIrregexp::IfRegisterEqPos(int register_index,
Label* on_eq) {
- DCHECK(register_index >= 0);
- DCHECK(register_index <= kMaxRegister);
+ DCHECK_LE(0, register_index);
+ DCHECK_GE(kMaxRegister, register_index);
Emit(BC_CHECK_REGISTER_EQ_POS, register_index);
EmitOrLink(on_eq);
}
@@ -439,8 +439,7 @@
return pc_;
}
-
-void RegExpMacroAssemblerIrregexp::Copy(Address a) {
+void RegExpMacroAssemblerIrregexp::Copy(byte* a) {
MemCopy(a, buffer_.start(), length());
}
