From 1854ba04e9a68f062beb299dd6e1479279b26363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 5 Dec 2017 16:41:55 +0100 Subject: deps: update V8 to 6.3.292.46 PR-URL: https://github.com/nodejs/node/pull/16271 Reviewed-By: Ben Noordhuis Reviewed-By: Myles Borins --- .../src/regexp/mips/regexp-macro-assembler-mips.cc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'deps/v8/src/regexp/mips') diff --git a/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc b/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc index 1a8f2c8d8e..03ceb0ee75 100644 --- a/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc +++ b/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc @@ -6,9 +6,11 @@ #include "src/regexp/mips/regexp-macro-assembler-mips.h" +#include "src/assembler-inl.h" #include "src/code-stubs.h" #include "src/log.h" #include "src/macro-assembler.h" +#include "src/objects-inl.h" #include "src/regexp/regexp-macro-assembler.h" #include "src/regexp/regexp-stack.h" #include "src/unicode.h" @@ -143,8 +145,8 @@ void RegExpMacroAssemblerMIPS::AdvanceCurrentPosition(int by) { void RegExpMacroAssemblerMIPS::AdvanceRegister(int reg, int by) { - DCHECK(reg >= 0); - DCHECK(reg < num_registers_); + DCHECK_LE(0, reg); + DCHECK_GT(num_registers_, reg); if (by != 0) { __ lw(a0, register_location(reg)); __ Addu(a0, a0, Operand(by)); @@ -289,7 +291,7 @@ void RegExpMacroAssemblerMIPS::CheckNotBackReferenceIgnoreCase( __ Subu(current_input_offset(), current_input_offset(), Operand(t5)); } } else { - DCHECK(mode_ == UC16); + DCHECK_EQ(UC16, mode_); // Put regexp engine registers on stack. RegList regexp_registers_to_retain = current_input_offset().bit() | current_character().bit() | backtrack_stackpointer().bit(); @@ -453,7 +455,7 @@ void RegExpMacroAssemblerMIPS::CheckNotCharacterAfterMinusAnd( uc16 minus, uc16 mask, Label* on_not_equal) { - DCHECK(minus < String::kMaxUtf16CodeUnit); + DCHECK_GT(String::kMaxUtf16CodeUnit, minus); __ Subu(a0, current_character(), Operand(minus)); __ And(a0, a0, Operand(mask)); BranchOrBacktrack(on_not_equal, ne, a0, Operand(c)); @@ -899,8 +901,8 @@ Handle RegExpMacroAssemblerMIPS::GetCode(Handle source) { CodeDesc code_desc; masm_->GetCode(isolate(), &code_desc); - Handle code = isolate()->factory()->NewCode( - code_desc, Code::ComputeFlags(Code::REGEXP), masm_->CodeObject()); + Handle code = isolate()->factory()->NewCode(code_desc, Code::REGEXP, + masm_->CodeObject()); LOG(masm_->isolate(), RegExpCodeCreateEvent(AbstractCode::cast(*code), *source)); return Handle::cast(code); @@ -1231,7 +1233,7 @@ void RegExpMacroAssemblerMIPS::SafeCallTarget(Label* name) { void RegExpMacroAssemblerMIPS::Push(Register source) { - DCHECK(!source.is(backtrack_stackpointer())); + DCHECK(source != backtrack_stackpointer()); __ Addu(backtrack_stackpointer(), backtrack_stackpointer(), Operand(-kPointerSize)); @@ -1240,7 +1242,7 @@ void RegExpMacroAssemblerMIPS::Push(Register source) { void RegExpMacroAssemblerMIPS::Pop(Register target) { - DCHECK(!target.is(backtrack_stackpointer())); + DCHECK(target != backtrack_stackpointer()); __ lw(target, MemOperand(backtrack_stackpointer())); __ Addu(backtrack_stackpointer(), backtrack_stackpointer(), kPointerSize); } @@ -1276,12 +1278,12 @@ void RegExpMacroAssemblerMIPS::LoadCurrentCharacterUnchecked(int cp_offset, } // We assume that we cannot do unaligned loads on MIPS, so this function // must only be used to load a single character at a time. - DCHECK(characters == 1); + DCHECK_EQ(1, characters); __ Addu(t5, end_of_input_address(), Operand(offset)); if (mode_ == LATIN1) { __ lbu(current_character(), MemOperand(t5, 0)); } else { - DCHECK(mode_ == UC16); + DCHECK_EQ(UC16, mode_); __ lhu(current_character(), MemOperand(t5, 0)); } } -- cgit v1.2.1