diff options
| author | Yabin Cui <yabinc@google.com> | 2015-04-16 18:35:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-16 18:35:14 +0000 |
| commit | e50dffa29fb6c67eba44e267aa890d35712de9dd (patch) | |
| tree | f0392c35efcf00bfc547dfe358d3a176dfc312e3 /runtime/gc | |
| parent | 73a3fb3d884f14e5de488bc679da4ce5ac7700be (diff) | |
| parent | c7df66e2cb124d261cf3b0691a09a3b6e357b6f1 (diff) | |
| download | art-e50dffa29fb6c67eba44e267aa890d35712de9dd.zip art-e50dffa29fb6c67eba44e267aa890d35712de9dd.tar.gz art-e50dffa29fb6c67eba44e267aa890d35712de9dd.tar.bz2 | |
Merge "Remove transitive dependency on <cutils/atomic.h>."
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index e65d1f1..14eb80b 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -16,6 +16,7 @@ #include "mark_sweep.h" +#include <atomic> #include <functional> #include <numeric> #include <climits> @@ -600,7 +601,7 @@ class MarkStackTask : public Task { mirror::Object* ref = obj->GetFieldObject<mirror::Object>(offset); if (ref != nullptr && mark_sweep_->MarkObjectParallel(ref)) { if (kUseFinger) { - android_memory_barrier(); + std::atomic_thread_fence(std::memory_order_seq_cst); if (reinterpret_cast<uintptr_t>(ref) >= static_cast<uintptr_t>(mark_sweep_->atomic_finger_.LoadRelaxed())) { return; |