diff options
Diffstat (limited to 'runtime/image-inl.h')
| -rw-r--r-- | runtime/image-inl.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/image-inl.h b/runtime/image-inl.h index 3a66a34cb3..c527f6fbcc 100644 --- a/runtime/image-inl.h +++ b/runtime/image-inl.h @@ -23,18 +23,19 @@ #include "imt_conflict_table.h" #include "imtable.h" #include "mirror/object_array-inl.h" +#include "obj_ptr-inl.h" #include "read_barrier-inl.h" namespace art { template <ReadBarrierOption kReadBarrierOption> -inline mirror::Object* ImageHeader::GetImageRoot(ImageRoot image_root) const { - mirror::ObjectArray<mirror::Object>* image_roots = GetImageRoots<kReadBarrierOption>(); +inline ObjPtr<mirror::Object> ImageHeader::GetImageRoot(ImageRoot image_root) const { + ObjPtr<mirror::ObjectArray<mirror::Object>> image_roots = GetImageRoots<kReadBarrierOption>(); return image_roots->Get<kVerifyNone, kReadBarrierOption>(static_cast<int32_t>(image_root)); } template <ReadBarrierOption kReadBarrierOption> -inline mirror::ObjectArray<mirror::Object>* ImageHeader::GetImageRoots() const { +inline ObjPtr<mirror::ObjectArray<mirror::Object>> ImageHeader::GetImageRoots() const { // Need a read barrier as it's not visited during root scan. // Pass in the address of the local variable to the read barrier // rather than image_roots_ because it won't move (asserted below) |