From 0984e483c1b8033250a32b11f112ae3e65eef39b Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 27 Mar 2019 16:41:41 +0000 Subject: Style cleanup for ObjPtr<>-ify changes. Replace "ObjPtr<.> const" with "const ObjPtr<.>". Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 31113334 Change-Id: I5a1c080bc88b091e15ee9eb0bb1ef6f6f290701c --- runtime/class_table-inl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/class_table-inl.h') diff --git a/runtime/class_table-inl.h b/runtime/class_table-inl.h index a2cdb2c28c..5f8a0b03c8 100644 --- a/runtime/class_table-inl.h +++ b/runtime/class_table-inl.h @@ -91,8 +91,8 @@ bool ClassTable::Visit(const Visitor& visitor) { template inline mirror::Class* ClassTable::TableSlot::Read() const { const uint32_t before = data_.load(std::memory_order_relaxed); - ObjPtr const before_ptr(ExtractPtr(before)); - ObjPtr const after_ptr( + const ObjPtr before_ptr(ExtractPtr(before)); + const ObjPtr after_ptr( GcRoot(before_ptr).Read()); if (kReadBarrierOption != kWithoutReadBarrier && before_ptr != after_ptr) { // If another thread raced and updated the reference, do not store the read barrier updated -- cgit v1.2.3-59-g8ed1b