commit a6aad92310895d35d8004da917100806d35d6b16
author Brian Carlstrom <bdc@google.com> Fri Mar 06 17:19:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 06 17:19:52 2015 +0000
tree 4d622517c9087ab5774ae056fab888a1a0d245f9
parent 0e242b5cad3c0b68b72f28c1e5fd3fdd4c05bfd8
parent a11a34c908e847711e6ccf221d61b45d0c4c963d

Merge "Do not dump memory usage if driver was never created"

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 8572f4d..128f623 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -1647,9 +1647,10 @@
   void LogCompletionTime() {
     // Note: when creation of a runtime fails, e.g., when trying to compile an app but when there
     //       is no image, there won't be a Runtime::Current().
+    // Note: driver creation can fail when loading an invalid dex file.
     LOG(INFO) << "dex2oat took " << PrettyDuration(NanoTime() - start_ns_)
               << " (threads: " << thread_count_ << ") "
-              << ((Runtime::Current() != nullptr) ?
+              << ((Runtime::Current() != nullptr && driver_.get() != nullptr) ?
                   driver_->GetMemoryUsageString(kIsDebugBuild || VLOG_IS_ON(compiler)) :
                   "");
   }