summaryrefslogtreecommitdiff
path: root/runtime/class_root.h
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2018-08-23 16:05:19 +0100
committer Roland Levillain <rpl@google.com> 2018-08-23 16:11:38 +0100
commitdee8169f20d96d00cd602c0ef590ebc3d0903936 (patch)
treeb8f45e87648b4b266b208508d51265446158181c /runtime/class_root.h
parent47c0e11bd02766b3eaf39f0d229011b4acbe549c (diff)
Fix the template parameter passed to some art::GetClassRoot uses.
Test: art/test.py Change-Id: Icb6a1103e1f84a480bcb186a47bc282912ccc18a
Diffstat (limited to 'runtime/class_root.h')
-rw-r--r--runtime/class_root.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_root.h b/runtime/class_root.h
index 4aa9801ab4..19a78b1ffb 100644
--- a/runtime/class_root.h
+++ b/runtime/class_root.h
@@ -165,18 +165,19 @@ CLASS_ROOT_LIST(SPECIALIZE_CLASS_ROOT_SELECTOR)
template <class MirrorType, ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
inline ObjPtr<mirror::Class> GetClassRoot(ObjPtr<mirror::ObjectArray<mirror::Class>> class_roots)
REQUIRES_SHARED(Locks::mutator_lock_) {
- return GetClassRoot<kWithReadBarrier>(detail::ClassRootSelector<MirrorType>::value, class_roots);
+ return GetClassRoot<kReadBarrierOption>(detail::ClassRootSelector<MirrorType>::value,
+ class_roots);
}
template <class MirrorType, ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
inline ObjPtr<mirror::Class> GetClassRoot(ClassLinker* linker)
REQUIRES_SHARED(Locks::mutator_lock_) {
- return GetClassRoot<kWithReadBarrier>(detail::ClassRootSelector<MirrorType>::value, linker);
+ return GetClassRoot<kReadBarrierOption>(detail::ClassRootSelector<MirrorType>::value, linker);
}
template <class MirrorType, ReadBarrierOption kReadBarrierOption = kWithReadBarrier>
inline ObjPtr<mirror::Class> GetClassRoot() REQUIRES_SHARED(Locks::mutator_lock_) {
- return GetClassRoot<kWithReadBarrier>(detail::ClassRootSelector<MirrorType>::value);
+ return GetClassRoot<kReadBarrierOption>(detail::ClassRootSelector<MirrorType>::value);
}
} // namespace art