commit f59c6dda4928cfb05d32a56fd161e3f86a9ca560
author Mathieu Chartier <mathieuc@google.com> Fri May 16 16:37:42 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 16 16:37:43 2014 +0000
tree 1ccfdefd83fa1c2b43128b79c61f9a0dc0281c42
parent 245e536fbe303a114cf3f2535122fcb327a243b7
parent 86ab7912423f63541073af5c487b509e9b2b5420

Merge "ART: Fix Segment Fault with null owner while monitor logging is enabled"

runtime/monitor.cc

diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index 64edba8..53e4a6f 100644
--- a/runtime/monitor.cc
+++ b/runtime/monitor.cc
@@ -625,8 +625,13 @@
   // Allocate and acquire a new monitor.
   UniquePtr<Monitor> m(new Monitor(self, owner, obj, hash_code));
   if (m->Install(self)) {
-    VLOG(monitor) << "monitor: thread " << owner->GetThreadId()
-                    << " created monitor " << m.get() << " for object " << obj;
+    if (owner != nullptr) {
+      VLOG(monitor) << "monitor: thread" << owner->GetThreadId()
+          << " created monitor " << m.get() << " for object " << obj;
+    } else {
+      VLOG(monitor) << "monitor: Inflate with hashcode " << hash_code
+          << " created monitor " << m.get() << " for object " << obj;
+    }
     Runtime::Current()->GetMonitorList()->Add(m.release());
     CHECK_EQ(obj->GetLockWord(true).GetState(), LockWord::kFatLocked);
   }