diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-16 10:59:25 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-18 12:50:33 -0700 |
| commit | f832284dd847ff077577bb5712225430bbbb3b67 (patch) | |
| tree | 44f6b91098639c6ebc438b4ec998d0dc128cef9a /runtime/native/java_lang_Class.cc | |
| parent | 8f0776768712b2021aa8fb649b51017b9f0fc7a9 (diff) | |
| download | android_art-f832284dd847ff077577bb5712225430bbbb3b67.tar.gz android_art-f832284dd847ff077577bb5712225430bbbb3b67.tar.bz2 android_art-f832284dd847ff077577bb5712225430bbbb3b67.zip | |
Delete ClassHelper and fix compaction bug in GetDirectInterface
Cleanup helps to prevent compaction bugs. Fixed a fairly serious
compaction error caused by calling ClassHelper::GetDirectInterface
without handling the case where it causes thread suspension due to
ResolveType.
Bug: 8981901
Change-Id: I82b3bb6dd48d21eb6ece7aae0733c4a23c2bc408
Diffstat (limited to 'runtime/native/java_lang_Class.cc')
| -rw-r--r-- | runtime/native/java_lang_Class.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index b6cf7d830f..e619dda133 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -84,8 +84,9 @@ static jclass Class_classForName(JNIEnv* env, jclass, jstring javaName, jboolean static jstring Class_getNameNative(JNIEnv* env, jobject javaThis) { ScopedFastNativeObjectAccess soa(env); - mirror::Class* c = DecodeClass(soa, javaThis); - return soa.AddLocalReference<jstring>(c->ComputeName()); + StackHandleScope<1> hs(soa.Self()); + mirror::Class* const c = DecodeClass(soa, javaThis); + return soa.AddLocalReference<jstring>(mirror::Class::ComputeName(hs.NewHandle(c))); } static jobjectArray Class_getProxyInterfaces(JNIEnv* env, jobject javaThis) { |