AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[heap] Trivial LocalEmbedderHeapTracer removals

Browse Source 
Some trivial removals to avoid bouncing in and out of the tree with
larger changes.

No-try: true
Bug: v8:13207
Change-Id: I7d9a6eec0e9a1b047d4684b1cd2477a6a4314dbb
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4156477
Commit-Queue: Dominik Inführ <dinfuehr@chromium.org>
Reviewed-by: Dominik Inführ <dinfuehr@chromium.org>
Auto-Submit: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#85274}
This commit is contained in:
Michael Lippautz 2023-01-12 18:33:15 +01:00 committed by V8 LUCI CQ
parent 34f63ad5e3
commit cb4a62e3c5
13 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/api.cc
View File

@ -65,7 +65,6 @@
#include "src/handles/persistent-handles.h"
#include "src/handles/shared-object-conveyor-handles.h"
#include "src/handles/traced-handles.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/heap-inl.h"
#include "src/heap/heap-write-barrier.h"
#include "src/heap/safepoint.h"

1
src/handles/global-handles.cc
View File

@ -17,7 +17,6 @@
#include "src/common/globals.h"
#include "src/execution/vm-state-inl.h"
#include "src/heap/base/stack.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/heap-inl.h"
#include "src/heap/heap-write-barrier-inl.h"
#include "src/heap/heap-write-barrier.h"

5
src/heap/concurrent-marking.cc
View File

@ -740,9 +740,8 @@ void ConcurrentMarking::RunMajor(JobDelegate* delegate,
WeakObjects::Local local_weak_objects(weak_objects_);
ConcurrentMarkingVisitor visitor(
task_id, &local_marking_worklists, &local_weak_objects, heap_,
mark_compact_epoch, code_flush_mode,
heap_->local_embedder_heap_tracer()->InUse(), should_keep_ages_unchanged,
&task_state->memory_chunk_data);
mark_compact_epoch, code_flush_mode, heap_->cpp_heap(),
should_keep_ages_unchanged, &task_state->memory_chunk_data);
NativeContextInferrer& native_context_inferrer =
task_state->native_context_inferrer;
NativeContextStats& native_context_stats = task_state->native_context_stats;

6
src/heap/cppgc-js/cpp-heap.cc
View File

@ -43,7 +43,6 @@
#include "src/heap/cppgc/sweeper.h"
#include "src/heap/cppgc/unmarker.h"
#include "src/heap/cppgc/visitor.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/gc-tracer.h"
#include "src/heap/heap.h"
#include "src/heap/marking-worklist.h"
@ -732,9 +731,8 @@ bool CppHeap::AdvanceTracing(double max_duration) {
return marking_done_;
}
bool CppHeap::IsTracingDone() {
if (!TracingInitialized()) return true;
return marking_done_;
bool CppHeap::IsTracingDone() const {
return !TracingInitialized() || marking_done_;
}
void CppHeap::EnterFinalPause(cppgc::EmbedderStackState stack_state) {

2
src/heap/cppgc-js/cpp-heap.h
View File

@ -140,7 +140,7 @@ class V8_EXPORT_PRIVATE CppHeap final
void InitializeTracing(CollectionType, GarbageCollectionFlags);
void StartTracing();
bool AdvanceTracing(double max_duration);
bool IsTracingDone();
bool IsTracingDone() const;
void TraceEpilogue();
void EnterFinalPause(cppgc::EmbedderStackState stack_state);
bool FinishConcurrentMarkingIfNeeded();

3
src/heap/cppgc-js/cpp-snapshot.cc
View File

@ -19,7 +19,6 @@
#include "src/heap/cppgc/heap-object-header.h"
#include "src/heap/cppgc/heap-visitor.h"
#include "src/heap/cppgc/visitor.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/mark-compact.h"
#include "src/objects/js-objects.h"
#include "src/profiler/heap-profiler.h"
@ -356,8 +355,6 @@ class StateStorage final {
void* ExtractEmbedderDataBackref(Isolate* isolate, CppHeap& cpp_heap,
v8::Local<v8::Value> v8_value) {
// See LocalEmbedderHeapTracer::VerboseWrapperTypeInfo for details on how
// wrapper objects are set up.
if (!v8_value->IsObject()) return nullptr;
Handle<Object> v8_object = Utils::OpenHandle(*v8_value);

1
src/heap/heap-write-barrier.cc
View File

@ -4,7 +4,6 @@
#include "src/heap/heap-write-barrier.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/heap-write-barrier-inl.h"
#include "src/heap/marking-barrier.h"
#include "src/heap/remembered-set.h"

1
src/heap/incremental-marking-job.cc
View File

@ -8,7 +8,6 @@
#include "src/base/platform/time.h"
#include "src/execution/isolate.h"
#include "src/execution/vm-state-inl.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/gc-tracer.h"
#include "src/heap/heap-inl.h"
#include "src/heap/heap.h"

1
src/heap/mark-compact.cc
View File

@ -27,6 +27,7 @@
#include "src/heap/basic-memory-chunk.h"
#include "src/heap/code-object-registry.h"
#include "src/heap/concurrent-allocator.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/evacuation-allocator-inl.h"
#include "src/heap/evacuation-verifier-inl.h"
#include "src/heap/gc-tracer-inl.h"

6
src/heap/mark-compact.h
View File

@ -191,11 +191,11 @@ class MainMarkingVisitor final
WeakObjects::Local* local_weak_objects, Heap* heap,
unsigned mark_compact_epoch,
base::EnumSet<CodeFlushMode> code_flush_mode,
bool embedder_tracing_enabled,
bool trace_embedder_fields,
bool should_keep_ages_unchanged)
: MarkingVisitorBase<MainMarkingVisitor<MarkingState>, MarkingState>(
local_marking_worklists, local_weak_objects, heap,
mark_compact_epoch, code_flush_mode, embedder_tracing_enabled,
mark_compact_epoch, code_flush_mode, trace_embedder_fields,
should_keep_ages_unchanged),
marking_state_(marking_state) {}
@ -263,7 +263,7 @@ class CollectorBase {
MarkingWorklists* marking_worklists() { return &marking_worklists_; }
MarkingWorklists::Local* local_marking_worklists() {
MarkingWorklists::Local* local_marking_worklists() const {
return local_marking_worklists_.get();
}

2
src/heap/marking-visitor-inl.h
View File

@ -312,7 +312,7 @@ int MarkingVisitorBase<ConcreteVisitor,
MarkingState>::VisitEmbedderTracingSubclass(Map map,
T object) {
DCHECK(object.MayHaveEmbedderFields());
if (V8_LIKELY(is_embedder_tracing_enabled_)) {
if (V8_LIKELY(trace_embedder_fields_)) {
return VisitEmbedderTracingSubClassWithEmbedderTracing(map, object);
}
return VisitEmbedderTracingSubClassNoEmbedderTracing(map, object);

6
src/heap/marking-visitor.h
View File

@ -43,7 +43,7 @@ class MarkingVisitorBase : public HeapVisitor<int, ConcreteVisitor> {
WeakObjects::Local* local_weak_objects, Heap* heap,
unsigned mark_compact_epoch,
base::EnumSet<CodeFlushMode> code_flush_mode,
bool is_embedder_tracing_enabled,
bool trace_embedder_fields,
bool should_keep_ages_unchanged)
: HeapVisitor<int, ConcreteVisitor>(heap),
local_marking_worklists_(local_marking_worklists),
@ -51,7 +51,7 @@ class MarkingVisitorBase : public HeapVisitor<int, ConcreteVisitor> {
heap_(heap),
mark_compact_epoch_(mark_compact_epoch),
code_flush_mode_(code_flush_mode),
is_embedder_tracing_enabled_(is_embedder_tracing_enabled),
trace_embedder_fields_(trace_embedder_fields),
should_keep_ages_unchanged_(should_keep_ages_unchanged),
should_mark_shared_heap_(heap->ShouldMarkSharedHeap())
#ifdef V8_ENABLE_SANDBOX
@ -189,7 +189,7 @@ class MarkingVisitorBase : public HeapVisitor<int, ConcreteVisitor> {
Heap* const heap_;
const unsigned mark_compact_epoch_;
const base::EnumSet<CodeFlushMode> code_flush_mode_;
const bool is_embedder_tracing_enabled_;
const bool trace_embedder_fields_;
const bool should_keep_ages_unchanged_;
const bool should_mark_shared_heap_;
#ifdef V8_ENABLE_SANDBOX

1
src/heap/objects-visiting-inl.h
View File

@ -6,7 +6,6 @@
#define V8_HEAP_OBJECTS_VISITING_INL_H_
#include "src/base/logging.h"
#include "src/heap/embedder-tracing.h"
#include "src/heap/mark-compact.h"
#include "src/heap/objects-visiting.h"
#include "src/objects/arguments.h"