diff options
Diffstat (limited to 'chromium/v8')
6 files changed, 17 insertions, 19 deletions
diff --git a/chromium/v8/src/heap/cppgc-js/cpp-heap.cc b/chromium/v8/src/heap/cppgc-js/cpp-heap.cc index 712be09f2c3..8ad35749783 100644 --- a/chromium/v8/src/heap/cppgc-js/cpp-heap.cc +++ b/chromium/v8/src/heap/cppgc-js/cpp-heap.cc @@ -81,7 +81,7 @@ class UnifiedHeapConcurrentMarker unified_heap_marking_state_(unified_heap_marking_state) {} std::unique_ptr<cppgc::Visitor> CreateConcurrentMarkingVisitor( - ConcurrentMarkingState&) const final; + cppgc::internal::ConcurrentMarkingState&) const final; private: UnifiedHeapMarkingState& unified_heap_marking_state_; @@ -89,7 +89,7 @@ class UnifiedHeapConcurrentMarker std::unique_ptr<cppgc::Visitor> UnifiedHeapConcurrentMarker::CreateConcurrentMarkingVisitor( - ConcurrentMarkingState& marking_state) const { + cppgc::internal::ConcurrentMarkingState& marking_state) const { return std::make_unique<ConcurrentUnifiedHeapMarkingVisitor>( heap(), marking_state, unified_heap_marking_state_); } diff --git a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc index e235f8885d9..16543fe0192 100644 --- a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc +++ b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc @@ -14,7 +14,7 @@ namespace v8 { namespace internal { UnifiedHeapMarkingVisitorBase::UnifiedHeapMarkingVisitorBase( - HeapBase& heap, MarkingStateBase& marking_state, + HeapBase& heap, cppgc::internal::MarkingStateBase& marking_state, UnifiedHeapMarkingState& unified_heap_marking_state) : JSVisitor(cppgc::internal::VisitorFactory::CreateKey()), marking_state_(marking_state), @@ -89,7 +89,7 @@ void MutatorUnifiedHeapMarkingVisitor::VisitWeakRoot(const void* object, } ConcurrentUnifiedHeapMarkingVisitor::ConcurrentUnifiedHeapMarkingVisitor( - HeapBase& heap, ConcurrentMarkingState& marking_state, + HeapBase& heap, cppgc::internal::ConcurrentMarkingState& marking_state, UnifiedHeapMarkingState& unified_heap_marking_state) : UnifiedHeapMarkingVisitorBase(heap, marking_state, unified_heap_marking_state) {} @@ -99,7 +99,7 @@ bool ConcurrentUnifiedHeapMarkingVisitor::DeferTraceToMutatorThreadIfConcurrent( size_t deferred_size) { marking_state_.concurrent_marking_bailout_worklist().Push( {parameter, callback, deferred_size}); - static_cast<ConcurrentMarkingState&>(marking_state_) + static_cast<cppgc::internal::ConcurrentMarkingState&>(marking_state_) .AccountDeferredMarkedBytes(deferred_size); return true; } diff --git a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h index 05e3affaa80..0231d2632c5 100644 --- a/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h +++ b/chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h @@ -28,14 +28,12 @@ namespace internal { using cppgc::SourceLocation; using cppgc::TraceDescriptor; using cppgc::WeakCallback; -using cppgc::internal::ConcurrentMarkingState; using cppgc::internal::HeapBase; -using cppgc::internal::MarkingStateBase; using cppgc::internal::MutatorMarkingState; class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { public: - UnifiedHeapMarkingVisitorBase(HeapBase&, MarkingStateBase&, + UnifiedHeapMarkingVisitorBase(HeapBase&, cppgc::internal::MarkingStateBase&, UnifiedHeapMarkingState&); ~UnifiedHeapMarkingVisitorBase() override = default; @@ -53,7 +51,7 @@ class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { // JS handling. void Visit(const TracedReferenceBase& ref) final; - MarkingStateBase& marking_state_; + cppgc::internal::MarkingStateBase& marking_state_; UnifiedHeapMarkingState& unified_heap_marking_state_; }; @@ -73,7 +71,7 @@ class V8_EXPORT_PRIVATE MutatorUnifiedHeapMarkingVisitor final class V8_EXPORT_PRIVATE ConcurrentUnifiedHeapMarkingVisitor final : public UnifiedHeapMarkingVisitorBase { public: - ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, ConcurrentMarkingState&, + ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, cppgc::internal::ConcurrentMarkingState&, UnifiedHeapMarkingState&); ~ConcurrentUnifiedHeapMarkingVisitor() override = default; diff --git a/chromium/v8/src/heap/cppgc/marker.cc b/chromium/v8/src/heap/cppgc/marker.cc index 236bc12af4f..d027c5e577b 100644 --- a/chromium/v8/src/heap/cppgc/marker.cc +++ b/chromium/v8/src/heap/cppgc/marker.cc @@ -84,9 +84,9 @@ void ResetRememberedSet(HeapBase& heap) { #endif } -static constexpr size_t kDefaultDeadlineCheckInterval = 150u; +static constexpr size_t kDefaultMarkerDeadlineCheckInterval = 150u; -template <size_t kDeadlineCheckInterval = kDefaultDeadlineCheckInterval, +template <size_t kDeadlineCheckInterval = kDefaultMarkerDeadlineCheckInterval, typename WorklistLocal, typename Callback> bool DrainWorklistWithBytesAndTimeDeadline(MarkingStateBase& marking_state, size_t marked_bytes_deadline, @@ -362,7 +362,7 @@ bool MarkerBase::ProcessWorklistsWithDeadline( // Bailout objects may be complicated to trace and thus might take longer // than other objects. Therefore we reduce the interval between deadline // checks to guarantee the deadline is not exceeded. - if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultDeadlineCheckInterval / + if (!DrainWorklistWithBytesAndTimeDeadline<kDefaultMarkerDeadlineCheckInterval / 5>( mutator_marking_state_, marked_bytes_deadline, time_deadline, mutator_marking_state_.concurrent_marking_bailout_worklist(), diff --git a/chromium/v8/src/regexp/experimental/experimental-compiler.cc b/chromium/v8/src/regexp/experimental/experimental-compiler.cc index 4d53c2c0c55..69390c4b61d 100644 --- a/chromium/v8/src/regexp/experimental/experimental-compiler.cc +++ b/chromium/v8/src/regexp/experimental/experimental-compiler.cc @@ -180,7 +180,7 @@ bool ExperimentalRegExpCompiler::CanBeHandled(RegExpTree* tree, return CanBeHandledVisitor::Check(tree, flags, capture_count); } -namespace { +namespace experimental { // A label in bytecode which starts with no known address. The address *must* // be bound with `Bind` before the label goes out of scope. @@ -628,7 +628,7 @@ class CompileVisitor : private RegExpVisitor { ZoneList<RegExpInstruction> ExperimentalRegExpCompiler::Compile( RegExpTree* tree, JSRegExp::Flags flags, Zone* zone) { - return CompileVisitor::Compile(tree, flags, zone); + return experimental::CompileVisitor::Compile(tree, flags, zone); } } // namespace internal diff --git a/chromium/v8/src/torque/csa-generator.cc b/chromium/v8/src/torque/csa-generator.cc index 93e8d47df42..68d38bf9658 100644 --- a/chromium/v8/src/torque/csa-generator.cc +++ b/chromium/v8/src/torque/csa-generator.cc @@ -849,8 +849,8 @@ void CSAGenerator::EmitInstruction(const StoreReferenceInstruction& instruction, } namespace { -std::string GetBitFieldSpecialization(const Type* container, - const BitField& field) { +std::string GetBitFieldSpecialization2(const Type* container, + const BitField& field) { auto smi_tagged_type = Type::MatchUnaryGeneric(container, TypeOracle::GetSmiTaggedGeneric()); std::string container_type = smi_tagged_type @@ -903,7 +903,7 @@ void CSAGenerator::EmitInstruction(const LoadBitFieldInstruction& instruction, out() << " " << result_name << " = ca_.UncheckedCast<" << field_type->GetGeneratedTNodeTypeName() << ">(CodeStubAssembler(state_)." << decoder << "<" - << GetBitFieldSpecialization(struct_type, instruction.bit_field) + << GetBitFieldSpecialization2(struct_type, instruction.bit_field) << ">(ca_.UncheckedCast<" << struct_word_type << ">(" << bit_field_struct << ")));\n"; } @@ -945,7 +945,7 @@ void CSAGenerator::EmitInstruction(const StoreBitFieldInstruction& instruction, std::string result_expression = "CodeStubAssembler(state_)." + encoder + "<" + - GetBitFieldSpecialization(struct_type, instruction.bit_field) + + GetBitFieldSpecialization2(struct_type, instruction.bit_field) + ">(ca_.UncheckedCast<" + struct_word_type + ">(" + bit_field_struct + "), ca_.UncheckedCast<" + field_word_type + ">(" + value + ")" + (instruction.starts_as_zero ? ", true" : "") + ")"; |