commit 141d62275f207bf68c55f583fb206fe586d857cf
author Ian Rogers <irogers@google.com> Thu Apr 05 12:23:06 2012 -0700
committer Ian Rogers <irogers@google.com> Thu Apr 05 18:11:20 2012 -0700
tree 6263e12c9194e966d452658f54612fc7b3b7e410
parent f3388e6ef460384a87c85bff72c961ebcd11ce0a

More X86 fixes.

Fix bugs in a few long entrypoints and with object validation being
enabled.

Change-Id: I18884fbbe6829b584b9fc92e338549577f925f14

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index d2aada4..8a7ab3d 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -313,6 +313,7 @@
 #if VERIFY_OBJECT_ENABLED
 void Heap::VerifyObject(const Object* obj) {
   if (this == NULL || !verify_objects_ || Runtime::Current()->IsShuttingDown() ||
+      Thread::Current() == NULL ||
       Runtime::Current()->GetThreadList()->GetLockOwner() == Thread::Current()->GetTid()) {
     return;
   }