Merge "Expect null referent in DequeuePendingReference()."
diff --git a/runtime/gc/reference_queue.cc b/runtime/gc/reference_queue.cc
index 0c0ab6d..56957ba 100644
--- a/runtime/gc/reference_queue.cc
+++ b/runtime/gc/reference_queue.cc
@@ -115,10 +115,12 @@
<< "ref=" << ref << " rb_ptr=" << ref->GetReadBarrierPointer();
}
mirror::Object* referent = ref->GetReferent<kWithoutReadBarrier>();
- CHECK(referent != nullptr) << "Reference should not have been enqueued if referent is null";
- CHECK(concurrent_copying->IsInToSpace(referent))
- << "ref=" << ref << " rb_ptr=" << ref->GetReadBarrierPointer()
- << " referent=" << referent;
+ // The referent could be null if it's cleared by a mutator (Reference.clear()).
+ if (referent != nullptr) {
+ CHECK(concurrent_copying->IsInToSpace(referent))
+ << "ref=" << ref << " rb_ptr=" << ref->GetReadBarrierPointer()
+ << " referent=" << referent;
+ }
}
}
return ref;