commit 068a875d3ae814c00049d162c92acf791d511edb
author Vladimir Marko <vmarko@google.com> Tue Apr 26 09:54:51 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 29 10:00:07 2022 +0000
tree 58ad1ba568044a5a65ae86dd027239d9e97794ba
parent 123c02bb75e1ddfb8d20bbd6e2e7c62ee64d6772

arm: Rewrite `art_quick_aput_obj`.

Test: run-gtests.sh
Test: testrunner.py --target --32 --optimizing
Test: testrunner.py --target --32 --optimizing --gcstress
Bug: 160737021
Change-Id: I32a51cee80dd33564481b9916967d6692c156d2e

tools/cpp-define-generator/lockword.def

diff --git a/tools/cpp-define-generator/lockword.def b/tools/cpp-define-generator/lockword.def
index a170c15..5494d59 100644
--- a/tools/cpp-define-generator/lockword.def
+++ b/tools/cpp-define-generator/lockword.def
@@ -30,10 +30,8 @@
            art::LockWord::kMarkBitStateMaskShifted)
 ASM_DEFINE(LOCK_WORD_MARK_BIT_SHIFT,
            art::LockWord::kMarkBitStateShift)
-ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK,
+ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK_SHIFTED,
            art::LockWord::kReadBarrierStateMaskShifted)
-ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK_TOGGLED,
-           art::LockWord::kReadBarrierStateMaskShiftedToggled)
 ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_SHIFT,
            art::LockWord::kReadBarrierStateShift)
 ASM_DEFINE(LOCK_WORD_STATE_FORWARDING_ADDRESS,