diff options
| author | Michaël Zasso <targos@protonmail.com> | 2018-01-24 20:16:06 +0100 |
|---|---|---|
| committer | Myles Borins <mylesborins@google.com> | 2018-01-24 15:02:20 -0800 |
| commit | 4c4af643e5042d615a60c6bbc05aee9d81b903e5 (patch) | |
| tree | 3fb0a97988fe4439ae3ae06f26915d1dcf8cab92 /deps/v8/src/regexp/ppc | |
| parent | fa9f31a4fda5a3782c652e56e394465805ebb50f (diff) | |
| download | android-node-v8-4c4af643e5042d615a60c6bbc05aee9d81b903e5.tar.gz android-node-v8-4c4af643e5042d615a60c6bbc05aee9d81b903e5.tar.bz2 android-node-v8-4c4af643e5042d615a60c6bbc05aee9d81b903e5.zip | |
deps: update V8 to 6.4.388.40
PR-URL: https://github.com/nodejs/node/pull/17489
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps/v8/src/regexp/ppc')
| -rw-r--r-- | deps/v8/src/regexp/ppc/OWNERS | 3 | ||||
| -rw-r--r-- | deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc | 8 | ||||
| -rw-r--r-- | deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/deps/v8/src/regexp/ppc/OWNERS b/deps/v8/src/regexp/ppc/OWNERS index 752e8e3d81..cf60da5cc7 100644 --- a/deps/v8/src/regexp/ppc/OWNERS +++ b/deps/v8/src/regexp/ppc/OWNERS @@ -3,4 +3,5 @@ dstence@us.ibm.com joransiu@ca.ibm.com mbrandy@us.ibm.com michael_dawson@ca.ibm.com -bjaideep@ca.ibm.com +jbarboza@ca.ibm.com +mmallick@ca.ibm.com diff --git a/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc b/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc index f8f5a0d2a3..bc3e643369 100644 --- a/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc +++ b/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc @@ -96,7 +96,7 @@ RegExpMacroAssemblerPPC::RegExpMacroAssemblerPPC(Isolate* isolate, Zone* zone, Mode mode, int registers_to_save) : NativeRegExpMacroAssembler(isolate, zone), - masm_(new MacroAssembler(isolate, NULL, kRegExpCodeSize, + masm_(new MacroAssembler(isolate, nullptr, kRegExpCodeSize, CodeObjectRequired::kYes)), mode_(mode), num_registers_(registers_to_save), @@ -913,7 +913,7 @@ Handle<HeapObject> RegExpMacroAssemblerPPC::GetCode(Handle<String> source) { ExternalReference grow_stack = ExternalReference::re_grow_stack(isolate()); __ CallCFunction(grow_stack, num_arguments); - // If return NULL, we have failed to grow the stack, and + // If return nullptr, we have failed to grow the stack, and // must exit with a stack-overflow exception. __ cmpi(r3, Operand::Zero()); __ beq(&exit_with_exception); @@ -1192,14 +1192,14 @@ void RegExpMacroAssemblerPPC::CheckPosition(int cp_offset, void RegExpMacroAssemblerPPC::BranchOrBacktrack(Condition condition, Label* to, CRegister cr) { if (condition == al) { // Unconditional. - if (to == NULL) { + if (to == nullptr) { Backtrack(); return; } __ b(to); return; } - if (to == NULL) { + if (to == nullptr) { __ b(condition, &backtrack_label_, cr); return; } diff --git a/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.h b/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.h index 775bc72d59..1e65600ecf 100644 --- a/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.h +++ b/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.h @@ -160,7 +160,7 @@ class RegExpMacroAssemblerPPC : public NativeRegExpMacroAssembler { inline int char_size() { return static_cast<int>(mode_); } // Equivalent to a conditional branch to the label, unless the label - // is NULL, in which case it is a conditional Backtrack. + // is nullptr, in which case it is a conditional Backtrack. void BranchOrBacktrack(Condition condition, Label* to, CRegister cr = cr7); // Call and return internally in the generated code in a way that |