commit e82a67e580ee77ed177a5c4471df134d04f5bf8e
author Mathieu Chartier <mathieuc@google.com> Fri Jan 23 00:50:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 23 00:50:28 2015 +0000
tree 5c46890e666b8d74baed83a6de6429e495c9e2a0
parent 40d9c6a2339a1610764c0266061e3a6040e64726
parent 4936159997132d7706d9700c646f35ef0283df4b

Merge "Fix compaction unsafe DescribeWait"

runtime/monitor.cc

diff --git a/runtime/monitor.cc b/runtime/monitor.cc
index ef63080..5e33380 100644
--- a/runtime/monitor.cc
+++ b/runtime/monitor.cc
@@ -933,8 +933,11 @@
                                            PrettyTypeOf(pretty_object).c_str());
       } else {
         // - waiting on <0x6008c468> (a java.lang.Class<java.lang.ref.ReferenceQueue>)
+        // Call PrettyTypeOf before IdentityHashCode since IdentityHashCode can cause thread
+        // suspension and move pretty_object.
+        const std::string pretty_type(PrettyTypeOf(pretty_object));
         os << wait_message << StringPrintf("<0x%08x> (a %s)", pretty_object->IdentityHashCode(),
-                                           PrettyTypeOf(pretty_object).c_str());
+                                           pretty_type.c_str());
       }
     }
     // - waiting to lock <0x613f83d8> (a java.lang.Object) held by thread 5