diff options
| author | 2018-08-15 10:55:10 +0000 | |
|---|---|---|
| committer | 2018-08-15 10:55:10 +0000 | |
| commit | 2b1a76fec7d1f7ba8b013c7d0967d216ef662a22 (patch) | |
| tree | b0e71b905f42235db42b756eb4d350cb1c516e3e /runtime/gc/reference_queue.cc | |
| parent | 017d63c144081b8977d63ecf3f67a7677ba77593 (diff) | |
| parent | 14e5a29a8c5dcd971376a4a04b3c3b05100b3f86 (diff) | |
Merge "Rename art::ReadBarrier::WhiteState as art::ReadBarrier::NonGrayState."
Diffstat (limited to 'runtime/gc/reference_queue.cc')
| -rw-r--r-- | runtime/gc/reference_queue.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/gc/reference_queue.cc b/runtime/gc/reference_queue.cc index 321d22a592..e25e279ea6 100644 --- a/runtime/gc/reference_queue.cc +++ b/runtime/gc/reference_queue.cc @@ -76,19 +76,19 @@ void ReferenceQueue::DisableReadBarrierForReference(ObjPtr<mirror::Reference> re Heap* heap = Runtime::Current()->GetHeap(); if (kUseBakerOrBrooksReadBarrier && heap->CurrentCollectorType() == kCollectorTypeCC && heap->ConcurrentCopyingCollector()->IsActive()) { - // Change the gray ptr we left in ConcurrentCopying::ProcessMarkStackRef() to white. + // Change the gray ptr we left in ConcurrentCopying::ProcessMarkStackRef() to non-gray. // We check IsActive() above because we don't want to do this when the zygote compaction // collector (SemiSpace) is running. CHECK(ref != nullptr); collector::ConcurrentCopying* concurrent_copying = heap->ConcurrentCopyingCollector(); uint32_t rb_state = ref->GetReadBarrierState(); if (rb_state == ReadBarrier::GrayState()) { - ref->AtomicSetReadBarrierState(ReadBarrier::GrayState(), ReadBarrier::WhiteState()); - CHECK_EQ(ref->GetReadBarrierState(), ReadBarrier::WhiteState()); + ref->AtomicSetReadBarrierState(ReadBarrier::GrayState(), ReadBarrier::NonGrayState()); + CHECK_EQ(ref->GetReadBarrierState(), ReadBarrier::NonGrayState()); } else { - // In ConcurrentCopying::ProcessMarkStackRef() we may leave a white reference in the queue and - // find it here, which is OK. - CHECK_EQ(rb_state, ReadBarrier::WhiteState()) << "ref=" << ref << " rb_state=" << rb_state; + // In ConcurrentCopying::ProcessMarkStackRef() we may leave a non-gray reference in the queue + // and find it here, which is OK. + CHECK_EQ(rb_state, ReadBarrier::NonGrayState()) << "ref=" << ref << " rb_state=" << rb_state; ObjPtr<mirror::Object> referent = ref->GetReferent<kWithoutReadBarrier>(); // The referent could be null if it's cleared by a mutator (Reference.clear()). if (referent != nullptr) { |