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

Unified Diff: runtime/vm/heap.cc

Issue 10114002: Relax assert so that the ia32 disassembler does not choke on C-heap allocated (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/heap.cc
===================================================================
--- runtime/vm/heap.cc (revision 6652)
+++ runtime/vm/heap.cc (working copy)
@@ -9,6 +9,7 @@
#include "vm/compiler_stats.h"
#include "vm/flags.h"
#include "vm/isolate.h"
+#include "vm/object.h"
#include "vm/os.h"
#include "vm/pages.h"
#include "vm/scavenger.h"
@@ -136,7 +137,8 @@
RawInstructions* Heap::FindObjectInCodeSpace(FindObjectVisitor* visitor) {
// The code heap can only have RawInstructions objects.
RawObject* raw_obj = code_space_->FindObject(visitor);
- ASSERT(raw_obj->ptr()->class_->ptr()->instance_kind_ == kInstructions);
+ ASSERT((raw_obj == Object::null()) ||
+ (raw_obj->ptr()->class_->ptr()->instance_kind_ == kInstructions));
return reinterpret_cast<RawInstructions*>(raw_obj);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698