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

Unified Diff: src/heap/incremental-marking.h

Issue 2860323003: [heap] Reland "Make non-atomic markbit operations consistent with atomic ones." (Closed)
Patch Set: fix Created 3 years, 7 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 | « src/heap/heap.cc ('k') | src/heap/incremental-marking.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/incremental-marking.h
diff --git a/src/heap/incremental-marking.h b/src/heap/incremental-marking.h
index 35978f3f8e6177463e83e0851d2ecfa2ceaf08bd..b412f0fffe45c17482b3b08d0169c27c645a9703 100644
--- a/src/heap/incremental-marking.h
+++ b/src/heap/incremental-marking.h
@@ -65,9 +65,6 @@ class V8_EXPORT_PRIVATE IncrementalMarking {
return MarkingState::Internal(chunk);
}
- void MarkBlack(HeapObject* object, int size);
- void MarkGrey(HeapObject* object);
-
// Transfers mark bits without requiring proper object headers.
void TransferMark(Heap* heap, HeapObject* from, HeapObject* to);
@@ -82,9 +79,15 @@ class V8_EXPORT_PRIVATE IncrementalMarking {
DCHECK(ObjectMarking::IsWhite<access_mode>(to, marking_state(to)));
if (ObjectMarking::IsGrey<access_mode>(from, marking_state(from))) {
- ObjectMarking::WhiteToGrey<access_mode>(to, marking_state(to));
+ bool success =
+ ObjectMarking::WhiteToGrey<access_mode>(to, marking_state(to));
+ DCHECK(success);
+ USE(success);
} else if (ObjectMarking::IsBlack<access_mode>(from, marking_state(from))) {
- ObjectMarking::WhiteToBlack<access_mode>(to, marking_state(to));
+ bool success =
+ ObjectMarking::WhiteToBlack<access_mode>(to, marking_state(to));
+ DCHECK(success);
+ USE(success);
}
}
@@ -210,7 +213,9 @@ class V8_EXPORT_PRIVATE IncrementalMarking {
void RecordCodeTargetPatch(Code* host, Address pc, HeapObject* value);
void RecordCodeTargetPatch(Address pc, HeapObject* value);
- void WhiteToGreyAndPush(HeapObject* obj);
+ // Returns true if the function succeeds in transitioning the object
+ // from white to grey.
+ bool WhiteToGreyAndPush(HeapObject* obj);
inline void SetOldSpacePageFlags(MemoryChunk* chunk) {
SetOldSpacePageFlags(chunk, IsMarking(), IsCompacting());
« no previous file with comments | « src/heap/heap.cc ('k') | src/heap/incremental-marking.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698