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/indirect_reference_table.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/indirect_reference_table.cc')
| -rw-r--r-- | runtime/indirect_reference_table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc index ed3fb5f..bbad884 100644 --- a/runtime/indirect_reference_table.cc +++ b/runtime/indirect_reference_table.cc @@ -360,7 +360,9 @@ mirror::Object* IndirectReferenceTable::Get(IndirectRef iref) const { return kInvalidIndirectRefObject; } mirror::Object* obj = table_[ExtractIndex(iref)];; - VerifyObject(obj); + if (obj != kClearedJniWeakGlobal) { + VerifyObject(obj); + } return obj; } |