Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: src/heap/heap.cc

Issue 1576853002: [heap] Adjust condition for AdjustLiveBytes to avoid concurrent access w/ sweeper (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/heap/mark-compact.cc » ('j') | src/heap/mark-compact.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index a90b7d6387d8510890da0516e4866b27af9cfc8f..99216fef5b186321b54e1a2a043edab52409432d 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -3108,6 +3108,7 @@ void Heap::AdjustLiveBytes(HeapObject* object, int by, InvocationMode mode) {
// update while using HeapIterator because the iterator is temporarily
// marking the whole object graph, without updating live bytes.
if (!in_heap_iterator() &&
+ !mark_compact_collector()->sweeping_in_progress() &&
Marking::IsBlack(Marking::MarkBitFrom(object->address()))) {
if (mode == SEQUENTIAL_TO_SWEEPER) {
MemoryChunk::IncrementLiveBytesFromGC(object, by);
« no previous file with comments | « no previous file | src/heap/mark-compact.cc » ('j') | src/heap/mark-compact.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698