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/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index c4a9bd7..c013726 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -634,7 +634,6 @@
                    options->heap_growth_limit_,
                    options->heap_maximum_size_,
                    options->image_);
-  heap_->EnableObjectValidation();
 
   BlockSignals();
 
@@ -649,6 +648,9 @@
   // Set us to runnable so tools using a runtime can allocate and GC by default
   Thread::Current()->SetState(Thread::kRunnable);
 
+  // Now we're attached, we can take the heap lock and validate the heap.
+  GetHeap()->EnableObjectValidation();
+
   CHECK_GE(GetHeap()->GetSpaces().size(), 1U);
   if (GetHeap()->GetSpaces()[0]->IsImageSpace()) {
     class_linker_ = ClassLinker::CreateFromImage(intern_table_);