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

Unified Diff: runtime/vm/verifier.cc

Issue 1092473002: Never mark free list elements. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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
« runtime/vm/object.cc ('K') | « runtime/vm/object.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/verifier.cc
===================================================================
--- runtime/vm/verifier.cc (revision 45122)
+++ runtime/vm/verifier.cc (working copy)
@@ -22,21 +22,26 @@
void VerifyObjectVisitor::VisitObject(RawObject* raw_obj) {
if (raw_obj->IsHeapObject()) {
- switch (mark_expectation_) {
- case kForbidMarked:
+ uword raw_addr = RawObject::ToAddr(raw_obj);
+ if (raw_obj->IsFreeListElement()) {
if (raw_obj->IsMarked()) {
- uword raw_addr = RawObject::ToAddr(raw_obj);
- FATAL1("Marked object encountered %#" Px "\n", raw_addr);
+ FATAL1("Marked free list element encountered %#" Px "\n", raw_addr);
}
- break;
- case kAllowMarked:
- break;
- case kRequireMarked:
- if (!raw_obj->IsMarked()) {
- uword raw_addr = RawObject::ToAddr(raw_obj);
- FATAL1("Unmarked object encountered %#" Px "\n", raw_addr);
+ } else {
+ switch (mark_expectation_) {
+ case kForbidMarked:
+ if (raw_obj->IsMarked()) {
+ FATAL1("Marked object encountered %#" Px "\n", raw_addr);
+ }
+ break;
+ case kAllowMarked:
+ break;
+ case kRequireMarked:
+ if (!raw_obj->IsMarked()) {
+ FATAL1("Unmarked object encountered %#" Px "\n", raw_addr);
+ }
+ break;
}
- break;
}
}
allocated_set_->Add(raw_obj);
« runtime/vm/object.cc ('K') | « runtime/vm/object.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698