Commit 2dad8d4
committed
deps: V8: cherry-pick bde7ee5473d6
Original commit message:
cppgc: avoid multiple class declarations
ConcurrentMarkingState and MarkingStateBase are already defined in the
This change fixes compilation with MSVC.
v8: :internal namespace.
Change-Id: Ib8a1370a0a27a90e385fd69e61036e263e1489e6
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2562671
Reviewed-by: Omer Katz <omerkatz@chromium.org>
Commit-Queue: Michaël Zasso <mic.besace@gmail.com>
Cr-Commit-Position: refs/heads/master@{#71473}
Refs: v8/v8@bde7ee5
PR-URL: #36139
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>1 parent 3046131 commit 2dad8d4
4 files changed
Lines changed: 10 additions & 11 deletions
File tree
- deps/v8/src/heap/cppgc-js
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.14', | ||
| 39 | + 'v8_embedder_string': '-node.15', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -81,15 +81,15 @@ class UnifiedHeapConcurrentMarker | |||
| 81 | 81 | unified_heap_marking_state_(unified_heap_marking_state) {} | |
| 82 | 82 | ||
| 83 | 83 | std::unique_ptr<cppgc::Visitor> CreateConcurrentMarkingVisitor( | |
| 84 | - ConcurrentMarkingState&) const final; | ||
| 84 | + cppgc::internal::ConcurrentMarkingState&) const final; | ||
| 85 | 85 | ||
| 86 | 86 | private: | |
| 87 | 87 | UnifiedHeapMarkingState& unified_heap_marking_state_; | |
| 88 | 88 | }; | |
| 89 | 89 | ||
| 90 | 90 | std::unique_ptr<cppgc::Visitor> | |
| 91 | 91 | UnifiedHeapConcurrentMarker::CreateConcurrentMarkingVisitor( | |
| 92 | - ConcurrentMarkingState& marking_state) const { | ||
| 92 | + cppgc::internal::ConcurrentMarkingState& marking_state) const { | ||
| 93 | 93 | return std::make_unique<ConcurrentUnifiedHeapMarkingVisitor>( | |
| 94 | 94 | heap(), marking_state, unified_heap_marking_state_); | |
| 95 | 95 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ namespace v8 { | |||
| 14 | 14 | namespace internal { | |
| 15 | 15 | ||
| 16 | 16 | UnifiedHeapMarkingVisitorBase::UnifiedHeapMarkingVisitorBase( | |
| 17 | - HeapBase& heap, MarkingStateBase& marking_state, | ||
| 17 | + HeapBase& heap, cppgc::internal::MarkingStateBase& marking_state, | ||
| 18 | 18 | UnifiedHeapMarkingState& unified_heap_marking_state) | |
| 19 | 19 | : JSVisitor(cppgc::internal::VisitorFactory::CreateKey()), | |
| 20 | 20 | marking_state_(marking_state), | |
@@ -89,7 +89,7 @@ void MutatorUnifiedHeapMarkingVisitor::VisitWeakRoot(const void* object, | |||
| 89 | 89 | } | |
| 90 | 90 | ||
| 91 | 91 | ConcurrentUnifiedHeapMarkingVisitor::ConcurrentUnifiedHeapMarkingVisitor( | |
| 92 | - HeapBase& heap, ConcurrentMarkingState& marking_state, | ||
| 92 | + HeapBase& heap, cppgc::internal::ConcurrentMarkingState& marking_state, | ||
| 93 | 93 | UnifiedHeapMarkingState& unified_heap_marking_state) | |
| 94 | 94 | : UnifiedHeapMarkingVisitorBase(heap, marking_state, | |
| 95 | 95 | unified_heap_marking_state) {} | |
@@ -99,7 +99,7 @@ bool ConcurrentUnifiedHeapMarkingVisitor::DeferTraceToMutatorThreadIfConcurrent( | |||
| 99 | 99 | size_t deferred_size) { | |
| 100 | 100 | marking_state_.concurrent_marking_bailout_worklist().Push( | |
| 101 | 101 | {parameter, callback, deferred_size}); | |
| 102 | - static_cast<ConcurrentMarkingState&>(marking_state_) | ||
| 102 | + static_cast<cppgc::internal::ConcurrentMarkingState&>(marking_state_) | ||
| 103 | 103 | .AccountDeferredMarkedBytes(deferred_size); | |
| 104 | 104 | return true; | |
| 105 | 105 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,14 +28,12 @@ namespace internal { | |||
| 28 | 28 | using cppgc::SourceLocation; | |
| 29 | 29 | using cppgc::TraceDescriptor; | |
| 30 | 30 | using cppgc::WeakCallback; | |
| 31 | - using cppgc::internal::ConcurrentMarkingState; | ||
| 32 | 31 | using cppgc::internal::HeapBase; | |
| 33 | - using cppgc::internal::MarkingStateBase; | ||
| 34 | 32 | using cppgc::internal::MutatorMarkingState; | |
| 35 | 33 | ||
| 36 | 34 | class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { | |
| 37 | 35 | public: | |
| 38 | - UnifiedHeapMarkingVisitorBase(HeapBase&, MarkingStateBase&, | ||
| 36 | + UnifiedHeapMarkingVisitorBase(HeapBase&, cppgc::internal::MarkingStateBase&, | ||
| 39 | 37 | UnifiedHeapMarkingState&); | |
| 40 | 38 | ~UnifiedHeapMarkingVisitorBase() override = default; | |
| 41 | 39 | ||
@@ -53,7 +51,7 @@ class V8_EXPORT_PRIVATE UnifiedHeapMarkingVisitorBase : public JSVisitor { | |||
| 53 | 51 | // JS handling. | |
| 54 | 52 | void Visit(const TracedReferenceBase& ref) final; | |
| 55 | 53 | ||
| 56 | - MarkingStateBase& marking_state_; | ||
| 54 | + cppgc::internal::MarkingStateBase& marking_state_; | ||
| 57 | 55 | UnifiedHeapMarkingState& unified_heap_marking_state_; | |
| 58 | 56 | }; | |
| 59 | 57 | ||
@@ -73,7 +71,8 @@ class V8_EXPORT_PRIVATE MutatorUnifiedHeapMarkingVisitor final | |||
| 73 | 71 | class V8_EXPORT_PRIVATE ConcurrentUnifiedHeapMarkingVisitor final | |
| 74 | 72 | : public UnifiedHeapMarkingVisitorBase { | |
| 75 | 73 | public: | |
| 76 | - ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, ConcurrentMarkingState&, | ||
| 74 | + ConcurrentUnifiedHeapMarkingVisitor(HeapBase&, | ||
| 75 | + cppgc::internal::ConcurrentMarkingState&, | ||
| 77 | 76 | UnifiedHeapMarkingState&); | |
| 78 | 77 | ~ConcurrentUnifiedHeapMarkingVisitor() override = default; | |
| 79 | 78 | ||
0 commit comments