commit 23e81a182fb71693b731ac24b6fc3969b7471473
author Ian Rogers <irogers@google.com> Wed Jul 05 09:36:27 2017 -0700
committer Ian Rogers <irogers@google.com> Wed Jul 05 15:05:35 2017 -0700
tree f916042ca693263e99b8f28c33b1061c5a8d4580
parent 4c4d9df7c79747978d2f927994a7b3c11a079075

Improve ImageWriter logging.

In the case of a locked object log the type of object and the thread
that locked it.

Test: test.py --host

Change-Id: Ibaf79cead765df6c212213017248d0f70d9cfbd7

compiler/image_writer.cc

diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc
index e75f75b..76ffc53 100644
--- a/compiler/image_writer.cc
+++ b/compiler/image_writer.cc
@@ -398,12 +398,18 @@
   // Before we stomp over the lock word, save the hash code for later.
   LockWord lw(object->GetLockWord(false));
   switch (lw.GetState()) {
-    case LockWord::kFatLocked: {
-      LOG(FATAL) << "Fat locked object " << object << " found during object copy";
-      break;
-    }
+    case LockWord::kFatLocked:
+      FALLTHROUGH_INTENDED;
     case LockWord::kThinLocked: {
-      LOG(FATAL) << "Thin locked object " << object << " found during object copy";
+      std::ostringstream oss;
+      bool thin = (lw.GetState() == LockWord::kThinLocked);
+      oss << (thin ? "Thin" : "Fat")
+          << " locked object " << object << "(" << object->PrettyTypeOf()
+          << ") found during object copy";
+      if (thin) {
+        oss << ". Lock owner:" << lw.ThinLockOwner();
+      }
+      LOG(FATAL) << oss.str();
       break;
     }
     case LockWord::kUnlocked: