commit c2f4d0240b3a9b905dff5b546924865f15241481
author Mathieu Chartier <mathieuc@google.com> Mon Mar 03 16:11:42 2014 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Mar 03 16:40:42 2014 -0800
tree 133e39fac183d8ea0818f93b8e5e88f4221b9555
parent 6b8c503c6df887ff30f478ab58bdfdb223492f45

Fix SafePrettyTypeOf to never call VerifyObject.

Calling VerifyObject from the segfault handler caused another
segfault.

Change-Id: I459646594d830cbb110a4ac2bac25a7b90794854

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 43db996..f9a5ea2 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -276,11 +276,13 @@
   // Computes the name, then sets the cached value.
   String* ComputeName() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
+  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
   bool IsProxyClass() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
     // Read access flags without using getter as whether something is a proxy can be check in
     // any loaded state
     // TODO: switch to a check if the super class is java.lang.reflect.Proxy?
-    uint32_t access_flags = GetField32(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_), false);
+    uint32_t access_flags = GetField32<kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Class, access_flags_),
+                                                     false);
     return (access_flags & kAccClassIsProxy) != 0;
   }
 
@@ -567,6 +569,7 @@
 
   void DumpClass(std::ostream& os, int flags) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
+  template<VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags>
   DexCache* GetDexCache() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
 
   void SetDexCache(DexCache* new_dex_cache) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);