diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-23 16:37:07 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-01-23 16:37:07 -0800 |
| commit | 55b2764c23776a7eba91d6514a4ad2cbc95e0fd0 (patch) | |
| tree | 940e7cf349a5a81372aae6c6d5721064719bd297 /runtime/gc/accounting/space_bitmap-inl.h | |
| parent | 2eea3f3c8ca18cd464fcb479acd6e2a2eea4f6c8 (diff) | |
| download | art-55b2764c23776a7eba91d6514a4ad2cbc95e0fd0.zip art-55b2764c23776a7eba91d6514a4ad2cbc95e0fd0.tar.gz art-55b2764c23776a7eba91d6514a4ad2cbc95e0fd0.tar.bz2 | |
64bit friendly GC CAS operations.
Change-Id: I54dfa5fdaf0d057ef74c84efb10a609e01923c9e
Diffstat (limited to 'runtime/gc/accounting/space_bitmap-inl.h')
| -rw-r--r-- | runtime/gc/accounting/space_bitmap-inl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h index 1dde18d..01c70fa 100644 --- a/runtime/gc/accounting/space_bitmap-inl.h +++ b/runtime/gc/accounting/space_bitmap-inl.h @@ -18,7 +18,6 @@ #define ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_ #include "base/logging.h" -#include "cutils/atomic-inline.h" #include "utils.h" namespace art { @@ -40,7 +39,7 @@ inline bool SpaceBitmap::AtomicTestAndSet(const mirror::Object* obj) { if ((old_word & mask) != 0) { return true; } - } while (UNLIKELY(android_atomic_cas(old_word, old_word | mask, address) != 0)); + } while (!__sync_bool_compare_and_swap(address, old_word, old_word | mask)); return false; } |