diff options
| author | 2018-08-15 10:55:10 +0000 | |
|---|---|---|
| committer | 2018-08-15 10:55:10 +0000 | |
| commit | 2b1a76fec7d1f7ba8b013c7d0967d216ef662a22 (patch) | |
| tree | b0e71b905f42235db42b756eb4d350cb1c516e3e /compiler/optimizing/intrinsics_x86.cc | |
| parent | 017d63c144081b8977d63ecf3f67a7677ba77593 (diff) | |
| parent | 14e5a29a8c5dcd971376a4a04b3c3b05100b3f86 (diff) | |
Merge "Rename art::ReadBarrier::WhiteState as art::ReadBarrier::NonGrayState."
Diffstat (limited to 'compiler/optimizing/intrinsics_x86.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_x86.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics_x86.cc b/compiler/optimizing/intrinsics_x86.cc index 98cea35af1..5c7be54037 100644 --- a/compiler/optimizing/intrinsics_x86.cc +++ b/compiler/optimizing/intrinsics_x86.cc @@ -2781,7 +2781,7 @@ void IntrinsicCodeGeneratorX86::VisitSystemArrayCopy(HInvoke* invoke) { __ j(kEqual, &done); // Given the numeric representation, it's enough to check the low bit of the rb_state. - static_assert(ReadBarrier::WhiteState() == 0, "Expecting white to have value 0"); + static_assert(ReadBarrier::NonGrayState() == 0, "Expecting non-gray to have value 0"); static_assert(ReadBarrier::GrayState() == 1, "Expecting gray to have value 1"); constexpr uint32_t gray_byte_position = LockWord::kReadBarrierStateShift / kBitsPerByte; constexpr uint32_t gray_bit_position = LockWord::kReadBarrierStateShift % kBitsPerByte; |