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

cppgc: young-gen: Fix verifier for minor GC in cpp-heap.

Browse Source 
Bug: chromium:1029379
Change-Id: I3970de943c58aa834bd12afd2d289c2034c65c1b
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3439913
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Auto-Submit: Anton Bikineev <bikineev@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78946}
This commit is contained in:
Anton Bikineev 2022-02-04 14:16:59 +01:00 committed by V8 LUCI CQ
parent 29c26dfa5a
commit db1d56ee91
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,8 @@ void CppHeap::EnterFinalPause(cppgc::EmbedderStackState stack_state) {
stack_state);
}
void CppHeap::TraceEpilogue() {
void CppHeap::TraceEpilogue(
cppgc::internal::GarbageCollector::Config::CollectionType collection_type) {
CHECK(in_atomic_pause_);
CHECK(marking_done_);
{
@ -534,8 +535,7 @@ void CppHeap::TraceEpilogue() {
buffered_allocated_bytes_ = 0;
const size_t bytes_allocated_in_prefinalizers = ExecutePreFinalizers();
#if CPPGC_VERIFY_HEAP
UnifiedHeapMarkingVerifier verifier(
*this, cppgc::internal::Heap::Config::CollectionType::kMajor);
UnifiedHeapMarkingVerifier verifier(*this, collection_type);
verifier.Run(
stack_state_of_prev_gc(), stack_end_of_current_gc(),
stats_collector()->marked_bytes() + bytes_allocated_in_prefinalizers);
@ -629,7 +629,7 @@ void CppHeap::CollectGarbageForTesting(
}
EnterFinalPause(stack_state);
AdvanceTracing(std::numeric_limits<double>::infinity());
TraceEpilogue();
TraceEpilogue(collection_type);
}
}

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

@ -124,7 +124,7 @@ class V8_EXPORT_PRIVATE CppHeap final
void StartTracing();
bool AdvanceTracing(double max_duration);
bool IsTracingDone();
void TraceEpilogue();
void TraceEpilogue(cppgc::internal::GarbageCollector::Config::CollectionType);
void EnterFinalPause(cppgc::EmbedderStackState stack_state);
// StatsCollector::AllocationObserver interface.

3
src/heap/embedder-tracing.cc
View File

@ -69,7 +69,8 @@ void LocalEmbedderHeapTracer::TraceEpilogue() {
EmbedderHeapTracer::EmbedderStackState::kMayContainHeapPointers;
if (cpp_heap_) {
cpp_heap()->TraceEpilogue();
cpp_heap()->TraceEpilogue(
cppgc::internal::GarbageCollector::Config::CollectionType::kMajor);
} else {
EmbedderHeapTracer::TraceSummary summary;
remote_tracer_->TraceEpilogue(&summary);