diff options
author | Michaël Zasso <targos@protonmail.com> | 2018-09-21 09:14:51 +0200 |
---|---|---|
committer | Michaël Zasso <targos@protonmail.com> | 2018-09-22 18:29:25 +0200 |
commit | 0e7ddbd3d7e9439c67573b854c49cf82c398ae82 (patch) | |
tree | 2afe372acde921cb57ddb3444ff00c5adef8848c /deps/v8/src/regexp | |
parent | 13245dc50da4cb7443c39ef6c68d419d5e6336d4 (diff) | |
download | android-node-v8-0e7ddbd3d7e9439c67573b854c49cf82c398ae82.tar.gz android-node-v8-0e7ddbd3d7e9439c67573b854c49cf82c398ae82.tar.bz2 android-node-v8-0e7ddbd3d7e9439c67573b854c49cf82c398ae82.zip |
deps: update V8 to 7.0.276.20
PR-URL: https://github.com/nodejs/node/pull/22754
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/src/regexp')
-rw-r--r-- | deps/v8/src/regexp/arm/OWNERS | 1 | ||||
-rw-r--r-- | deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc | 2 | ||||
-rw-r--r-- | deps/v8/src/regexp/arm64/OWNERS | 1 | ||||
-rw-r--r-- | deps/v8/src/regexp/ia32/regexp-macro-assembler-ia32.cc | 12 | ||||
-rw-r--r-- | deps/v8/src/regexp/mips/OWNERS | 5 | ||||
-rw-r--r-- | deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc | 2 | ||||
-rw-r--r-- | deps/v8/src/regexp/mips64/OWNERS | 5 | ||||
-rw-r--r-- | deps/v8/src/regexp/mips64/regexp-macro-assembler-mips64.cc | 2 | ||||
-rw-r--r-- | deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc | 2 | ||||
-rw-r--r-- | deps/v8/src/regexp/regexp-utils.cc | 5 | ||||
-rw-r--r-- | deps/v8/src/regexp/regexp-utils.h | 4 | ||||
-rw-r--r-- | deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc | 4 | ||||
-rw-r--r-- | deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc | 9 | ||||
-rw-r--r-- | deps/v8/src/regexp/x64/regexp-macro-assembler-x64.h | 5 |
14 files changed, 27 insertions, 32 deletions
diff --git a/deps/v8/src/regexp/arm/OWNERS b/deps/v8/src/regexp/arm/OWNERS deleted file mode 100644 index 906a5ce641..0000000000 --- a/deps/v8/src/regexp/arm/OWNERS +++ /dev/null @@ -1 +0,0 @@ -rmcilroy@chromium.org diff --git a/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc b/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc index d2a20f3af7..f77d521728 100644 --- a/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc +++ b/deps/v8/src/regexp/arm/regexp-macro-assembler-arm.cc @@ -1080,7 +1080,7 @@ void RegExpMacroAssemblerARM::CallCheckStackGuardState() { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } diff --git a/deps/v8/src/regexp/arm64/OWNERS b/deps/v8/src/regexp/arm64/OWNERS deleted file mode 100644 index 906a5ce641..0000000000 --- a/deps/v8/src/regexp/arm64/OWNERS +++ /dev/null @@ -1 +0,0 @@ -rmcilroy@chromium.org diff --git a/deps/v8/src/regexp/ia32/regexp-macro-assembler-ia32.cc b/deps/v8/src/regexp/ia32/regexp-macro-assembler-ia32.cc index cd84329a78..0d479cacb2 100644 --- a/deps/v8/src/regexp/ia32/regexp-macro-assembler-ia32.cc +++ b/deps/v8/src/regexp/ia32/regexp-macro-assembler-ia32.cc @@ -585,7 +585,7 @@ bool RegExpMacroAssemblerIA32::CheckSpecialCharacterClass(uc16 type, ExternalReference word_map = ExternalReference::re_word_character_map(isolate()); __ test_b(current_character(), - Operand::StaticArray(current_character(), times_1, word_map)); + masm_->StaticArray(current_character(), times_1, word_map)); BranchOrBacktrack(zero, on_no_match); return true; } @@ -600,7 +600,7 @@ bool RegExpMacroAssemblerIA32::CheckSpecialCharacterClass(uc16 type, ExternalReference word_map = ExternalReference::re_word_character_map(isolate()); __ test_b(current_character(), - Operand::StaticArray(current_character(), times_1, word_map)); + masm_->StaticArray(current_character(), times_1, word_map)); BranchOrBacktrack(not_zero, on_no_match); if (mode_ != LATIN1) { __ bind(&done); @@ -681,7 +681,7 @@ Handle<HeapObject> RegExpMacroAssemblerIA32::GetCode(Handle<String> source) { ExternalReference stack_limit = ExternalReference::address_of_stack_limit(isolate()); __ mov(ecx, esp); - __ sub(ecx, Operand::StaticVariable(stack_limit)); + __ sub(ecx, masm_->StaticVariable(stack_limit)); // Handle it if the stack pointer is already below the stack limit. __ j(below_equal, &stack_limit_hit); // Check if there is room for the variable number of registers above @@ -1108,7 +1108,7 @@ void RegExpMacroAssemblerIA32::CallCheckStackGuardState(Register scratch) { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } @@ -1219,7 +1219,7 @@ void RegExpMacroAssemblerIA32::CheckPreemption() { Label no_preempt; ExternalReference stack_limit = ExternalReference::address_of_stack_limit(isolate()); - __ cmp(esp, Operand::StaticVariable(stack_limit)); + __ cmp(esp, masm_->StaticVariable(stack_limit)); __ j(above, &no_preempt); SafeCall(&check_preempt_label_); @@ -1232,7 +1232,7 @@ void RegExpMacroAssemblerIA32::CheckStackLimit() { Label no_stack_overflow; ExternalReference stack_limit = ExternalReference::address_of_regexp_stack_limit(isolate()); - __ cmp(backtrack_stackpointer(), Operand::StaticVariable(stack_limit)); + __ cmp(backtrack_stackpointer(), masm_->StaticVariable(stack_limit)); __ j(above, &no_stack_overflow); SafeCall(&stack_overflow_label_); diff --git a/deps/v8/src/regexp/mips/OWNERS b/deps/v8/src/regexp/mips/OWNERS index 4ce9d7f91d..8bbcab4c2d 100644 --- a/deps/v8/src/regexp/mips/OWNERS +++ b/deps/v8/src/regexp/mips/OWNERS @@ -1,3 +1,2 @@ -ivica.bogosavljevic@mips.com -Miran.Karic@mips.com -sreten.kovacevic@mips.com
\ No newline at end of file +ibogosavljevic@wavecomp.com +skovacevic@wavecomp.com
\ No newline at end of file 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 e16fbd6568..36ac93275e 100644 --- a/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc +++ b/deps/v8/src/regexp/mips/regexp-macro-assembler-mips.cc @@ -1143,7 +1143,7 @@ void RegExpMacroAssemblerMIPS::CallCheckStackGuardState(Register scratch) { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } diff --git a/deps/v8/src/regexp/mips64/OWNERS b/deps/v8/src/regexp/mips64/OWNERS index 4ce9d7f91d..8bbcab4c2d 100644 --- a/deps/v8/src/regexp/mips64/OWNERS +++ b/deps/v8/src/regexp/mips64/OWNERS @@ -1,3 +1,2 @@ -ivica.bogosavljevic@mips.com -Miran.Karic@mips.com -sreten.kovacevic@mips.com
\ No newline at end of file +ibogosavljevic@wavecomp.com +skovacevic@wavecomp.com
\ No newline at end of file diff --git a/deps/v8/src/regexp/mips64/regexp-macro-assembler-mips64.cc b/deps/v8/src/regexp/mips64/regexp-macro-assembler-mips64.cc index 40ac387c4e..17a8ce8752 100644 --- a/deps/v8/src/regexp/mips64/regexp-macro-assembler-mips64.cc +++ b/deps/v8/src/regexp/mips64/regexp-macro-assembler-mips64.cc @@ -1181,7 +1181,7 @@ void RegExpMacroAssemblerMIPS::CallCheckStackGuardState(Register scratch) { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } 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 fdda46424e..494422074c 100644 --- a/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc +++ b/deps/v8/src/regexp/ppc/regexp-macro-assembler-ppc.cc @@ -1143,7 +1143,7 @@ void RegExpMacroAssemblerPPC::CallCheckStackGuardState(Register scratch) { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } diff --git a/deps/v8/src/regexp/regexp-utils.cc b/deps/v8/src/regexp/regexp-utils.cc index 1f89844f10..c787a50297 100644 --- a/deps/v8/src/regexp/regexp-utils.cc +++ b/deps/v8/src/regexp/regexp-utils.cc @@ -166,8 +166,7 @@ bool RegExpUtils::IsUnmodifiedRegExp(Isolate* isolate, Handle<Object> obj) { return last_index->IsSmi() && Smi::ToInt(last_index) >= 0; } -uint64_t RegExpUtils::AdvanceStringIndex(Isolate* isolate, - Handle<String> string, uint64_t index, +uint64_t RegExpUtils::AdvanceStringIndex(Handle<String> string, uint64_t index, bool unicode) { DCHECK_LE(static_cast<double>(index), kMaxSafeInteger); const uint64_t string_length = static_cast<uint64_t>(string->length()); @@ -199,7 +198,7 @@ MaybeHandle<Object> RegExpUtils::SetAdvancedStringIndex( Object::ToLength(isolate, last_index_obj), Object); const uint64_t last_index = PositiveNumberToUint64(*last_index_obj); const uint64_t new_last_index = - AdvanceStringIndex(isolate, string, last_index, unicode); + AdvanceStringIndex(string, last_index, unicode); return SetLastIndex(isolate, regexp, new_last_index); } diff --git a/deps/v8/src/regexp/regexp-utils.h b/deps/v8/src/regexp/regexp-utils.h index 7508403e01..8fc6607d98 100644 --- a/deps/v8/src/regexp/regexp-utils.h +++ b/deps/v8/src/regexp/regexp-utils.h @@ -41,8 +41,8 @@ class RegExpUtils : public AllStatic { // ES#sec-advancestringindex // AdvanceStringIndex ( S, index, unicode ) - static uint64_t AdvanceStringIndex(Isolate* isolate, Handle<String> string, - uint64_t index, bool unicode); + static uint64_t AdvanceStringIndex(Handle<String> string, uint64_t index, + bool unicode); static V8_WARN_UNUSED_RESULT MaybeHandle<Object> SetAdvancedStringIndex( Isolate* isolate, Handle<JSReceiver> regexp, Handle<String> string, bool unicode); diff --git a/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc b/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc index 837d5639cc..3db1ebc421 100644 --- a/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc +++ b/deps/v8/src/regexp/s390/regexp-macro-assembler-s390.cc @@ -1089,9 +1089,9 @@ template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { DCHECK_EQ(kPointerSize, sizeof(T)); #ifdef V8_TARGET_ARCH_S390X - return reinterpret_cast<T&>(Memory::uint64_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<uint64_t>(re_frame + frame_offset)); #else - return reinterpret_cast<T&>(Memory::uint32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<uint32_t>(re_frame + frame_offset)); #endif } diff --git a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc index c032ca1ff8..43f80767ea 100644 --- a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc +++ b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.cc @@ -99,7 +99,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isolate* isolate, Zone* zone, : NativeRegExpMacroAssembler(isolate, zone), masm_(isolate, nullptr, kRegExpCodeSize, CodeObjectRequired::kYes), no_root_array_scope_(&masm_), - code_relative_fixup_positions_(4, zone), + code_relative_fixup_positions_(zone), mode_(mode), num_registers_(registers_to_save), num_saved_registers_(registers_to_save), @@ -1208,7 +1208,7 @@ void RegExpMacroAssemblerX64::CallCheckStackGuardState() { // Helper function for reading a value out of a stack frame. template <typename T> static T& frame_entry(Address re_frame, int frame_offset) { - return reinterpret_cast<T&>(Memory::int32_at(re_frame + frame_offset)); + return reinterpret_cast<T&>(Memory<int32_t>(re_frame + frame_offset)); } @@ -1304,8 +1304,7 @@ void RegExpMacroAssemblerX64::Push(Immediate value) { void RegExpMacroAssemblerX64::FixupCodeRelativePositions() { - for (int i = 0, n = code_relative_fixup_positions_.length(); i < n; i++) { - int position = code_relative_fixup_positions_[i]; + for (int position : code_relative_fixup_positions_) { // The position succeeds a relative label offset from position. // Patch the relative offset to be relative to the Code object pointer // instead. @@ -1317,7 +1316,7 @@ void RegExpMacroAssemblerX64::FixupCodeRelativePositions() { + Code::kHeaderSize - kHeapObjectTag); } - code_relative_fixup_positions_.Clear(); + code_relative_fixup_positions_.Rewind(0); } diff --git a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.h b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.h index 365bbaa6b2..1cf2f73ac3 100644 --- a/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.h +++ b/deps/v8/src/regexp/x64/regexp-macro-assembler-x64.h @@ -8,6 +8,7 @@ #include "src/macro-assembler.h" #include "src/regexp/regexp-macro-assembler.h" #include "src/x64/assembler-x64.h" +#include "src/zone/zone-chunk-list.h" namespace v8 { namespace internal { @@ -215,7 +216,7 @@ class RegExpMacroAssemblerX64: public NativeRegExpMacroAssembler { void BranchOrBacktrack(Condition condition, Label* to); void MarkPositionForCodeRelativeFixup() { - code_relative_fixup_positions_.Add(masm_.pc_offset(), zone()); + code_relative_fixup_positions_.push_back(masm_.pc_offset()); } void FixupCodeRelativePositions(); @@ -254,7 +255,7 @@ class RegExpMacroAssemblerX64: public NativeRegExpMacroAssembler { MacroAssembler masm_; NoRootArrayScope no_root_array_scope_; - ZoneList<int> code_relative_fixup_positions_; + ZoneChunkList<int> code_relative_fixup_positions_; // Which mode to generate code for (LATIN1 or UC16). Mode mode_; |