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

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

Issue 2886223002: [heap] Expand verification of layout changes to non-JSObject objects. (Closed)
Patch Set: 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/objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/heap/incremental-marking.cc
diff --git a/src/heap/incremental-marking.cc b/src/heap/incremental-marking.cc
index cb9f46782de264d3272baf809edce8f88b68ac89..1015667dc71edfc77256526311af4f0effb01ebf 100644
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@@ -873,8 +873,11 @@ void IncrementalMarking::VisitObject(Map* map, HeapObject* obj, int size) {
// 1. The object is a fixed array with the progress bar.
// 2. The object is a JSObject that was colored black before
// unsafe layout change.
+ // 3. The object is a string that was colored black before
+ // unsafe layout change.
if (!ObjectMarking::GreyToBlack<kAtomicity>(obj, marking_state(obj))) {
- DCHECK(IsFixedArrayWithProgressBar(obj) || obj->IsJSObject());
+ DCHECK(IsFixedArrayWithProgressBar(obj) || obj->IsJSObject() ||
+ obj->IsString());
}
DCHECK(ObjectMarking::IsBlack<kAtomicity>(obj, marking_state(obj)));
WhiteToGreyAndPush(map);
« no previous file with comments | « src/heap/heap.cc ('k') | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698