From dee8169f20d96d00cd602c0ef590ebc3d0903936 Mon Sep 17 00:00:00 2001
From: Roland Levillain <rpl@google.com>
Date: Thu, 23 Aug 2018 16:05:19 +0100
Subject: Fix the template parameter passed to some art::GetClassRoot uses.

Test: art/test.py
Change-Id: Icb6a1103e1f84a480bcb186a47bc282912ccc18a
---
 runtime/class_root.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime/class_root.h')

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
-- 
cgit v1.2.3-59-g8ed1b