Skip to content

Commit 1dac4dc

Browse files
committed
Merge #19758: Drop deprecated and unused GUARDED_VAR and PT_GUARDED_VAR annotations
9034f6e Drop deprecated and unused GUARDED_VAR and PT_GUARDED_VAR annotations (Hennadii Stepanov) Pull request description: https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#guarded-var-and-pt-guarded-var: > `GUARDED_VAR` and `PT_GUARDED_VAR` > Use of these attributes has been deprecated. ACKs for top commit: MarcoFalke: ACK 9034f6e They seem to be deprecated for a long time already https://releases.llvm.org/4.0.0/tools/clang/docs/ThreadSafetyAnalysis.html#guarded-var-and-pt-guarded-var Tree-SHA512: d86f55fe57c28d91eda4a0ad727e36a5b35ba4b50a557c59b83cf0c5291cc5ad37b6f4ba6daeba3c1aba143faadaea6bb21c723f4d221856d6e6c42d228e8aa2
2 parents 4326515 + 9034f6e commit 1dac4dc

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/threadsafety.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
#define LOCKABLE __attribute__((lockable))
1919
#define SCOPED_LOCKABLE __attribute__((scoped_lockable))
2020
#define GUARDED_BY(x) __attribute__((guarded_by(x)))
21-
#define GUARDED_VAR __attribute__((guarded_var))
2221
#define PT_GUARDED_BY(x) __attribute__((pt_guarded_by(x)))
23-
#define PT_GUARDED_VAR __attribute__((pt_guarded_var))
2422
#define ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))
2523
#define ACQUIRED_BEFORE(...) __attribute__((acquired_before(__VA_ARGS__)))
2624
#define EXCLUSIVE_LOCK_FUNCTION(...) __attribute__((exclusive_lock_function(__VA_ARGS__)))
@@ -33,14 +31,12 @@
3331
#define EXCLUSIVE_LOCKS_REQUIRED(...) __attribute__((exclusive_locks_required(__VA_ARGS__)))
3432
#define SHARED_LOCKS_REQUIRED(...) __attribute__((shared_locks_required(__VA_ARGS__)))
3533
#define NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))
36-
#define ASSERT_EXCLUSIVE_LOCK(...) __attribute((assert_exclusive_lock(__VA_ARGS__)))
34+
#define ASSERT_EXCLUSIVE_LOCK(...) __attribute__((assert_exclusive_lock(__VA_ARGS__)))
3735
#else
3836
#define LOCKABLE
3937
#define SCOPED_LOCKABLE
4038
#define GUARDED_BY(x)
41-
#define GUARDED_VAR
4239
#define PT_GUARDED_BY(x)
43-
#define PT_GUARDED_VAR
4440
#define ACQUIRED_AFTER(...)
4541
#define ACQUIRED_BEFORE(...)
4642
#define EXCLUSIVE_LOCK_FUNCTION(...)

0 commit comments

Comments
 (0)