[compiler-rt] r330395 - Revert r330376 "[sanitizer] Generalize atomic_uint8_t, atomic_uint16_t, ... into a template. NFC."
Hans Wennborg via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 20 00:34:59 PDT 2018
Author: hans
Date: Fri Apr 20 00:34:59 2018
New Revision: 330395
URL: http://llvm.org/viewvc/llvm-project?rev=330395&view=rev
Log:
Revert r330376 "[sanitizer] Generalize atomic_uint8_t, atomic_uint16_t, ... into a template. NFC."
This broke the Windows build, see e.g. http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10130
> Differential Revision: https://reviews.llvm.org/D44246
Modified:
compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h?rev=330395&r1=330394&r2=330395&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_atomic.h Fri Apr 20 00:34:59 2018
@@ -27,18 +27,36 @@ enum memory_order {
memory_order_seq_cst = 1 << 5
};
-template<typename T>
-struct atomic {
- typedef T Type;
- volatile Type ALIGNED(sizeof(Type)) val_dont_use;
+struct atomic_uint8_t {
+ typedef u8 Type;
+ volatile Type val_dont_use;
};
-typedef atomic<u8> atomic_uint8_t;
-typedef atomic<u16> atomic_uint16_t;
-typedef atomic<s32> atomic_sint32_t;
-typedef atomic<u32> atomic_uint32_t;
-typedef atomic<u64> atomic_uint64_t;
-typedef atomic<uptr> atomic_uintptr_t;
+struct atomic_uint16_t {
+ typedef u16 Type;
+ volatile Type val_dont_use;
+};
+
+struct atomic_sint32_t {
+ typedef s32 Type;
+ volatile Type val_dont_use;
+};
+
+struct atomic_uint32_t {
+ typedef u32 Type;
+ volatile Type val_dont_use;
+};
+
+struct atomic_uint64_t {
+ typedef u64 Type;
+ // On 32-bit platforms u64 is not necessary aligned on 8 bytes.
+ volatile ALIGNED(8) Type val_dont_use;
+};
+
+struct atomic_uintptr_t {
+ typedef uptr Type;
+ volatile Type val_dont_use;
+};
} // namespace __sanitizer
More information about the llvm-commits
mailing list