am 84551e76: am 2dce8b3c: am 5d8b7b22: Merge "Fix build."
* commit '84551e767e7beae692f513fba5ce13c1c8155fc9':
Fix build.
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index d0b6279..ea1ccdd 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1867,7 +1867,7 @@
: heap_(heap), fail_count_(fail_count), verify_referent_(verify_referent) {}
size_t GetFailureCount() const {
- return fail_count_->Load();
+ return fail_count_->LoadSequentiallyConsistent();
}
void operator()(mirror::Class* klass, mirror::Reference* ref) const
@@ -1904,7 +1904,7 @@
// Verify that the reference is live.
return true;
}
- if (fail_count_->FetchAndAdd(1) == 0) {
+ if (fail_count_->FetchAndAddSequentiallyConsistent(1) == 0) {
// Print message on only on first failure to prevent spam.
LOG(ERROR) << "!!!!!!!!!!!!!!Heap corruption detected!!!!!!!!!!!!!!!!!!!";
}
@@ -2020,7 +2020,7 @@
}
size_t GetFailureCount() const {
- return fail_count_->Load();
+ return fail_count_->LoadSequentiallyConsistent();
}
private:
