commit 3f1fec648e263901736bd704a7750c7c6b89fbf8
author Mathieu Chartier <mathieuc@google.com> Wed Oct 17 09:14:05 2018 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Oct 17 16:32:05 2018 +0000
tree 62ee485fa1b8e2e89e7b7795cb5e16f4ea09ded8
parent 74844fb5e2a76a5dddde00c1aa91980a7bb518aa

Fix -verbose:image errors

Error 1: Deferencing empty space array
Error 2: Calling DumpTiming before the scoped split is closed.

Fixe device booting with -verbose:image enabled.

Bug: 116059983
Bug: 77856493
Test: test-art-host
Test: manual
Change-Id: I8389019e1430db736e84c2670e4c2d1499b23c1a

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 16359ac..8ba8e33 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -429,9 +429,9 @@
                image_header->GetImageMethod(ImageHeader::kSaveEverythingMethodForSuspendCheck));
 
       VLOG(image) << "ImageSpace::Loader::InitAppImage exiting " << *space.get();
-      if (VLOG_IS_ON(image)) {
-        logger.Dump(LOG_STREAM(INFO));
-      }
+    }
+    if (VLOG_IS_ON(image)) {
+      logger.Dump(LOG_STREAM(INFO));
     }
     return space;
   }
@@ -1396,9 +1396,9 @@
     MaybeRelocateSpaces(spaces, &logger);
     InitRuntimeMethods(spaces);
     *extra_reservation = std::move(local_extra_reservation);
+    VLOG(image) << "ImageSpace::BootImageLoader::InitFromDalvikCache exiting " << *spaces.front();
     boot_image_spaces->swap(spaces);
 
-    VLOG(image) << "ImageSpace::BootImageLoader::InitFromDalvikCache exiting " << *spaces.front();
     if (VLOG_IS_ON(image)) {
       logger.Dump(LOG_STREAM(INFO));
     }