diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-07 15:00:39 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-03-07 15:28:43 -0800 |
| commit | 5647d189c3ea5324e569d96cef67c87879d6cd05 (patch) | |
| tree | bdf872592ef681147d9b28af2c38b11f603fe910 /runtime/jni_internal.cc | |
| parent | aa00fe010eb7b61c2de82611ce3f6fc0918a4f9e (diff) | |
| download | art-5647d189c3ea5324e569d96cef67c87879d6cd05.zip art-5647d189c3ea5324e569d96cef67c87879d6cd05.tar.gz art-5647d189c3ea5324e569d96cef67c87879d6cd05.tar.bz2 | |
Fix tests to pass with VerifyObject.
A SIRT ref with a null class was causing object verification problems
in space_test.
Change-Id: I95cfc3da5e0fec0155387f75612b0a3f26f6d3c9
Diffstat (limited to 'runtime/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index f8865ea..6efff1a 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -3194,11 +3194,7 @@ mirror::Object* JavaVMExt::DecodeWeakGlobal(Thread* self, IndirectRef ref) { while (UNLIKELY(!allow_new_weak_globals_)) { weak_globals_add_condition_.WaitHoldingLocks(self); } - mirror::Object* obj = weak_globals_.Get(ref); - if (obj != kClearedJniWeakGlobal) { - VerifyObject(obj); - } - return obj; + return weak_globals_.Get(ref); } void JavaVMExt::DumpReferenceTables(std::ostream& os) { |