commit d777112c261696f60536c1b9cd2a407722a90137
author Mathieu Chartier <mathieuc@google.com> Mon Nov 17 21:55:28 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 17 21:55:29 2014 +0000
tree d7fe67259afb70cb9ff911762c7edccc1d68ed1d
parent 5d99e333bcb454add372fe776a00d3172146bd6b
parent bc58ede2eebe20d592959b88c36fb74d4d832441

Merge "Don't call AddImageStringsToTable or MoveImageClassesToClassTable if running imageless"

runtime/intern_table.cc

diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc
index 56a6d2c..7ecb58e 100644
--- a/runtime/intern_table.cc
+++ b/runtime/intern_table.cc
@@ -148,6 +148,7 @@
 }
 
 void InternTable::AddImageStringsToTable(gc::space::ImageSpace* image_space) {
+  CHECK(image_space != nullptr);
   MutexLock mu(Thread::Current(), *Locks::intern_table_lock_);
   if (!image_added_to_intern_table_) {
     mirror::Object* root = image_space->GetImageHeader().GetImageRoot(ImageHeader::kDexCaches);

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 78c6542..d50a4f0 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -440,8 +440,11 @@
 
   if (IsZygote()) {
     ScopedObjectAccess soa(self);
-    Runtime::Current()->GetInternTable()->AddImageStringsToTable(heap_->GetImageSpace());
-    Runtime::Current()->GetClassLinker()->MoveImageClassesToClassTable();
+    gc::space::ImageSpace* image_space = heap_->GetImageSpace();
+    if (image_space != nullptr) {
+      Runtime::Current()->GetInternTable()->AddImageStringsToTable(image_space);
+      Runtime::Current()->GetClassLinker()->MoveImageClassesToClassTable();
+    }
   }
 
   if (!IsImageDex2OatEnabled() || !Runtime::Current()->GetHeap()->HasImageSpace()) {