diff options
| author | 2016-01-23 14:15:49 +0000 | |
|---|---|---|
| committer | 2016-01-23 14:15:49 +0000 | |
| commit | 1bc977cf2f8199311a97f2ba9431a184540e3e9c (patch) | |
| tree | 580a02752d8e447f6dce7cce01386c7e2a9a87f4 /runtime/mirror/object_array-inl.h | |
| parent | f7fd970244f143b1abb956e29794c446e4d57f46 (diff) | |
Revert "Load app images"
Fails when a method is duplicated (see test 097-duplicate-method)
Bug: 22858531
This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46.
Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20
Diffstat (limited to 'runtime/mirror/object_array-inl.h')
| -rw-r--r-- | runtime/mirror/object_array-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h index 6f9d64297a..5337760fb8 100644 --- a/runtime/mirror/object_array-inl.h +++ b/runtime/mirror/object_array-inl.h @@ -55,13 +55,13 @@ inline ObjectArray<T>* ObjectArray<T>::Alloc(Thread* self, Class* object_array_c Runtime::Current()->GetHeap()->GetCurrentAllocator()); } -template<class T> template<VerifyObjectFlags kVerifyFlags, ReadBarrierOption kReadBarrierOption> +template<class T> inline T* ObjectArray<T>::Get(int32_t i) { if (!CheckIsValidIndex(i)) { DCHECK(Thread::Current()->IsExceptionPending()); return nullptr; } - return GetFieldObject<T, kVerifyFlags, kReadBarrierOption>(OffsetOfElement(i)); + return GetFieldObject<T>(OffsetOfElement(i)); } template<class T> template<VerifyObjectFlags kVerifyFlags> |