commit 4dcbffb3c6e8757d127dede32c8efa6c04e44a70
author Brian Carlstrom <bdc@google.com> Wed Mar 07 00:21:18 2012 -0800
committer Brian Carlstrom <bdc@google.com> Wed Mar 07 00:21:18 2012 -0800
tree 568c490d168780cf314c550c1b10c5459e68d78c
parent a79d86d1564ae2ab75055ce62beb4f07d2f6bd5d

Fix oatdump OAT_LOCATION output

regressed in 3a5c1ce3f11805a3382046f699c8fb1410a602b3

Change-Id: I85ea2d8a4e5c97ac69a5a9d505b58bbd98215234

src/oatdump.cc

diff --git a/src/oatdump.cc b/src/oatdump.cc
index 7333bc3..4b492aa 100644
--- a/src/oatdump.cc
+++ b/src/oatdump.cc
@@ -521,18 +521,22 @@
     }
     os_ << "\n";
 
+    os_ << "OAT LOCATION:\n" << std::flush;
     ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
     Object* oat_location_object = image_header_.GetImageRoot(ImageHeader::kOatLocation);
     std::string oat_location(oat_location_object->AsString()->ToModifiedUtf8());
+    os_ << oat_location;
     if (!host_prefix_.empty()) {
       oat_location = host_prefix_ + oat_location;
       os_ << " (" << oat_location << ")";
     }
+    os_ << "\n";
     const OatFile* oat_file = class_linker->FindOatFileFromOatLocation(oat_location);
     if (oat_file == NULL) {
-      os_ << "OAT FILE NOT FOUND: " << oat_location << std::endl << std::flush;
+      os_ << "NOT FOUND\n";
       return;
     }
+    os_ << "\n";
 
     stats_.oat_file_bytes = oat_file->Size();
 
@@ -556,9 +560,6 @@
 
     os_ << std::flush;
 
-    os_ << "OAT LOCATION:\n" << std::flush;
-    os_ << oat_location;
-    os_ << "\n";
     oat_dumper_->Dump(os_);
   }