@@ -95,8 +95,7 @@ static constexpr morder kMacFailureOrder = mo_relaxed;
95
95
m_orig (int32_t , uint32_t , a32, f##32 ##OrigBarrier, \
96
96
__tsan_atomic32_##tsan_atomic_f, kMacOrderBarrier )
97
97
98
- # pragma clang diagnostic push
99
- // OSAtomic* functions are deprecated.
98
+ # pragma clang diagnostic push // OSAtomic* deprecation
100
99
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
101
100
OSATOMIC_INTERCEPTORS_ARITHMETIC (OSAtomicAdd, fetch_add,
102
101
OSATOMIC_INTERCEPTOR_PLUS_X)
@@ -110,6 +109,7 @@ OSATOMIC_INTERCEPTORS_BITWISE(OSAtomicAnd, fetch_and,
110
109
OSATOMIC_INTERCEPTOR_PLUS_X, OSATOMIC_INTERCEPTOR)
111
110
OSATOMIC_INTERCEPTORS_BITWISE (OSAtomicXor, fetch_xor,
112
111
OSATOMIC_INTERCEPTOR_PLUS_X, OSATOMIC_INTERCEPTOR)
112
+ # pragma clang diagnostic pop // OSAtomic* deprecation
113
113
114
114
# define OSATOMIC_INTERCEPTORS_CAS (f, tsan_atomic_f, tsan_t, t ) \
115
115
TSAN_INTERCEPTOR (bool , f, t old_value, t new_value, t volatile *ptr) { \
@@ -127,8 +127,7 @@ OSATOMIC_INTERCEPTORS_BITWISE(OSAtomicXor, fetch_xor,
127
127
kMacOrderBarrier , kMacFailureOrder ); \
128
128
}
129
129
130
- # pragma clang diagnostic push
131
- // OSAtomicCompareAndSwap* functions are deprecated.
130
+ # pragma clang diagnostic push // OSAtomicCompareAndSwap* deprecation
132
131
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
133
132
OSATOMIC_INTERCEPTORS_CAS (OSAtomicCompareAndSwapInt, __tsan_atomic32, a32, int )
134
133
OSATOMIC_INTERCEPTORS_CAS (OSAtomicCompareAndSwapLong, __tsan_atomic64, a64,
@@ -139,7 +138,7 @@ OSATOMIC_INTERCEPTORS_CAS(OSAtomicCompareAndSwap32, __tsan_atomic32, a32,
139
138
int32_t )
140
139
OSATOMIC_INTERCEPTORS_CAS (OSAtomicCompareAndSwap64, __tsan_atomic64, a64,
141
140
int64_t )
142
- # pragma clang diagnostic pop
141
+ # pragma clang diagnostic pop // OSAtomicCompareAndSwap* deprecation
143
142
144
143
# define OSATOMIC_INTERCEPTOR_BITOP (f, op, clear, mo ) \
145
144
TSAN_INTERCEPTOR (bool , f, uint32_t n, volatile void *ptr) { \
@@ -155,9 +154,12 @@ OSATOMIC_INTERCEPTORS_CAS(OSAtomicCompareAndSwap64, __tsan_atomic64, a64,
155
154
OSATOMIC_INTERCEPTOR_BITOP (f, op, clear, kMacOrderNonBarrier ) \
156
155
OSATOMIC_INTERCEPTOR_BITOP (f##Barrier, op, clear, kMacOrderBarrier )
157
156
157
+ # pragma clang diagnostic push // OSAtomicTestAnd* deprecation
158
+ # pragma clang diagnostic ignored "-Wdeprecated-declarations"
158
159
OSATOMIC_INTERCEPTORS_BITOP (OSAtomicTestAndSet, __tsan_atomic8_fetch_or, false )
159
160
OSATOMIC_INTERCEPTORS_BITOP (OSAtomicTestAndClear, __tsan_atomic8_fetch_and,
160
161
true )
162
+ # pragma clang diagnostic pop // OSAtomicTestAnd* deprecation
161
163
162
164
TSAN_INTERCEPTOR (void , OSAtomicEnqueue, OSQueueHead *list, void *item,
163
165
size_t offset) {
@@ -202,8 +204,7 @@ TSAN_INTERCEPTOR(void *, OSAtomicFifoDequeue, OSFifoQueueHead *list,
202
204
# undef OSSpinLockTry
203
205
# undef OSSpinLockUnlock
204
206
205
- # pragma clang diagnostic push
206
- // OSSpinLock* functions are deprecated.
207
+ # pragma clang diagnostic push // OSSpinLock* deprecation
207
208
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
208
209
209
210
TSAN_INTERCEPTOR (void , OSSpinLockLock, volatile OSSpinLock *lock) {
0 commit comments