diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-03-06 11:11:48 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-03-06 11:43:06 -0800 |
| commit | 6dda898d47b3e8931e4404330e81b7110108e34f (patch) | |
| tree | d8a0a20b8ac1ce3cd44273cf5c748d09980bd800 /runtime/indirect_reference_table.cc | |
| parent | 8785d615122d4abbd22db702139584e8c472f502 (diff) | |
| download | art-6dda898d47b3e8931e4404330e81b7110108e34f.zip art-6dda898d47b3e8931e4404330e81b7110108e34f.tar.gz art-6dda898d47b3e8931e4404330e81b7110108e34f.tar.bz2 | |
Disable compaction for jni workarounds.
Compaction can't work when jni workarounds is enabled. Also some
other refactoring.
Change-Id: Ia7b0f2b39c79f5a0a5f50874d823b950ab02a0c3
Diffstat (limited to 'runtime/indirect_reference_table.cc')
| -rw-r--r-- | runtime/indirect_reference_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc index 54c7b6e..82b53f6 100644 --- a/runtime/indirect_reference_table.cc +++ b/runtime/indirect_reference_table.cc @@ -21,6 +21,7 @@ #include "scoped_thread_state_change.h" #include "thread.h" #include "utils.h" +#include "verify_object-inl.h" #include <cstdlib> @@ -81,8 +82,7 @@ IndirectRef IndirectReferenceTable::Add(uint32_t cookie, mirror::Object* obj) { size_t topIndex = segment_state_.parts.topIndex; CHECK(obj != NULL); - // TODO: stronger sanity check on the object (such as in heap) - DCHECK_ALIGNED(reinterpret_cast<uintptr_t>(obj), 8); + VerifyObject(obj); DCHECK(table_ != NULL); DCHECK_LE(alloc_entries_, max_entries_); DCHECK_GE(segment_state_.parts.numHoles, prevState.parts.numHoles); |