Index: include/ports/SkAtomics_atomic.h |
diff --git a/include/ports/SkAtomics_atomic.h b/include/ports/SkAtomics_atomic.h |
index 3ae328a153fca91049fcdf18d11ff76d6c93f998..6ae78a89a97702925597a6be4e9049088a009e6d 100644 |
--- a/include/ports/SkAtomics_atomic.h |
+++ b/include/ports/SkAtomics_atomic.h |
@@ -3,16 +3,24 @@ |
template <typename T> |
T sk_atomic_load(const T* ptr, sk_memory_order mo) { |
+ SkASSERT(mo == sk_memory_order_relaxed || |
+ mo == sk_memory_order_seq_cst || |
+ mo == sk_memory_order_acquire || |
+ mo == sk_memory_order_consume); |
return __atomic_load_n(ptr, mo); |
} |
template <typename T> |
void sk_atomic_store(T* ptr, T val, sk_memory_order mo) { |
+ SkASSERT(mo == sk_memory_order_relaxed || |
+ mo == sk_memory_order_seq_cst || |
+ mo == sk_memory_order_release); |
__atomic_store_n(ptr, val, mo); |
} |
template <typename T> |
T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) { |
+ // All values of mo are valid. |
return __atomic_fetch_add(ptr, val, mo); |
} |
@@ -20,6 +28,12 @@ template <typename T> |
bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, |
sk_memory_order success, |
sk_memory_order failure) { |
+ // All values of success are valid. |
+ SkASSERT(failure == sk_memory_order_relaxed || |
+ failure == sk_memory_order_seq_cst || |
+ failure == sk_memory_order_acquire || |
+ failure == sk_memory_order_consume); |
+ SkASSERT(failure <= success); |
return __atomic_compare_exchange_n(ptr, expected, desired, false/*weak?*/, success, failure); |
} |