Rename art::ReadBarrier::WhiteState as art::ReadBarrier::NonGrayState.
The read barrier state recorded in object's lockword used to be a
three-state value (white/gray/black), which was turned into a
two-state value (white/gray), where the "black" state was conceptually
merged into the "white" state. This change renames the "white" state
as "non-gray" and adjusts corresponding comments.
Test: art/test.py
Change-Id: I2a17ed15651bdbbe99270c1b81b4d78a1c2c132b
diff --git a/runtime/read_barrier.h b/runtime/read_barrier.h
index e8df2ad..0741da6 100644
--- a/runtime/read_barrier.h
+++ b/runtime/read_barrier.h
@@ -102,11 +102,11 @@
// ALWAYS_INLINE on this caused a performance regression b/26744236.
static mirror::Object* Mark(mirror::Object* obj) REQUIRES_SHARED(Locks::mutator_lock_);
- static constexpr uint32_t WhiteState() {
- return white_state_;
+ static constexpr uint32_t NonGrayState() {
+ return kNonGrayState;
}
static constexpr uint32_t GrayState() {
- return gray_state_;
+ return kGrayState;
}
// fake_address_dependency will be zero which should be bitwise-or'ed with the address of the
@@ -122,12 +122,13 @@
REQUIRES_SHARED(Locks::mutator_lock_);
static bool IsValidReadBarrierState(uint32_t rb_state) {
- return rb_state == white_state_ || rb_state == gray_state_;
+ return rb_state == kNonGrayState || rb_state == kGrayState;
}
- static constexpr uint32_t white_state_ = 0x0; // Not marked.
- static constexpr uint32_t gray_state_ = 0x1; // Marked, but not marked through. On mark stack.
- static constexpr uint32_t rb_state_mask_ = 0x1; // The low bits for white|gray.
+ private:
+ static constexpr uint32_t kNonGrayState = 0x0; // White (not marked) or black (marked through).
+ static constexpr uint32_t kGrayState = 0x1; // Marked, but not marked through. On mark stack.
+ static constexpr uint32_t kRBStateMask = 0x1; // The low bits for non-gray|gray.
};
} // namespace art