From 97b90eeccf8e3b805abc355ae38465dfbcd9e23c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 5 Mar 2020 16:32:43 +0100 Subject: Fixes for jumbo build Fixes necessary to make jumbo build work Change-Id: I1551ddeaa15fdc4e9db72e86ea49191193cb4964 Reviewed-by: Michal Klocek --- chromium/v8/src/heap/cppgc-js/cpp-heap.cc | 4 ++-- chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.cc | 6 +++--- chromium/v8/src/heap/cppgc-js/unified-heap-marking-visitor.h | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'chromium/v8/src/heap/cppgc-js') 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 CreateConcurrentMarkingVisitor( - ConcurrentMarkingState&) const final; + cppgc::internal::ConcurrentMarkingState&) const final; private: UnifiedHeapMarkingState& unified_heap_marking_state_; @@ -89,7 +89,7 @@ class UnifiedHeapConcurrentMarker std::unique_ptr UnifiedHeapConcurrentMarker::CreateConcurrentMarkingVisitor( - ConcurrentMarkingState& marking_state) const { + cppgc::internal::ConcurrentMarkingState& marking_state) const { return std::make_unique( 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(marking_state_) + static_cast(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; -- cgit v1.2.1