diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-03 16:11:42 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-03-03 16:40:42 -0800 |
| commit | c2f4d0240b3a9b905dff5b546924865f15241481 (patch) | |
| tree | 133e39fac183d8ea0818f93b8e5e88f4221b9555 /runtime/mirror/class-inl.h | |
| parent | 6b8c503c6df887ff30f478ab58bdfdb223492f45 (diff) | |
| download | android_art-c2f4d0240b3a9b905dff5b546924865f15241481.tar.gz android_art-c2f4d0240b3a9b905dff5b546924865f15241481.tar.bz2 android_art-c2f4d0240b3a9b905dff5b546924865f15241481.zip | |
Fix SafePrettyTypeOf to never call VerifyObject.
Calling VerifyObject from the segfault handler caused another
segfault.
Change-Id: I459646594d830cbb110a4ac2bac25a7b90794854
Diffstat (limited to 'runtime/mirror/class-inl.h')
| -rw-r--r-- | runtime/mirror/class-inl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index e82c39389d..e3f4eedbe0 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -49,8 +49,9 @@ inline ClassLoader* Class::GetClassLoader() { return GetFieldObject<ClassLoader>(OFFSET_OF_OBJECT_MEMBER(Class, class_loader_), false); } +template<VerifyObjectFlags kVerifyFlags> inline DexCache* Class::GetDexCache() { - return GetFieldObject<DexCache>(OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_), false); + return GetFieldObject<DexCache, kVerifyFlags>(OFFSET_OF_OBJECT_MEMBER(Class, dex_cache_), false); } inline ObjectArray<ArtMethod>* Class::GetDirectMethods() { |