[PATCH] D36071: [builtins] Use Interlocked* intrinsics for atomics on MSVC

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo updated this revision to Diff 109487.
mstorsjo retitled this revision from "[builtins] Use _Interlocked* intrinsics for atomics on MSVC" to "[builtins] Use Interlocked* intrinsics for atomics on MSVC".
mstorsjo added a comment.

Added the requested comment. Switched to the version of the intrinsics without a leading underscore, which made it work more consistently across MSVC versions, simplifying the code yet quite a bit.


https://reviews.llvm.org/D36071

Files:
  lib/builtins/emutls.c


Index: lib/builtins/emutls.c
===================================================================
--- lib/builtins/emutls.c
+++ lib/builtins/emutls.c
@@ -102,7 +102,6 @@
 #include <malloc.h>
 #include <stdio.h>
 #include <assert.h>
-#include <immintrin.h>
 
 static LPCRITICAL_SECTION emutls_mutex;
 static DWORD emutls_tls_index = TLS_OUT_OF_INDEXES;
@@ -207,25 +206,24 @@
 /* Provide atomic load/store functions for emutls_get_index if built with MSVC.
  */
 #if !defined(__ATOMIC_RELEASE)
+#include <intrin.h>
 
 enum { __ATOMIC_ACQUIRE = 2, __ATOMIC_RELEASE = 3 };
 
 static __inline uintptr_t __atomic_load_n(void *ptr, unsigned type) {
     assert(type == __ATOMIC_ACQUIRE);
+    // These return the previous value - but since we do an OR with 0,
+    // it's equivalent to a plain load.
 #ifdef _WIN64
-    return (uintptr_t) _load_be_u64(ptr);
+    return InterlockedOr64(ptr, 0);
 #else
-    return (uintptr_t) _load_be_u32(ptr);
+    return InterlockedOr(ptr, 0);
 #endif
 }
 
 static __inline void __atomic_store_n(void *ptr, uintptr_t val, unsigned type) {
     assert(type == __ATOMIC_RELEASE);
-#ifdef _WIN64
-    _store_be_u64(ptr, val);
-#else
-    _store_be_u32(ptr, val);
-#endif
+    InterlockedExchangePointer((void *volatile *)ptr, (void *)val);
 }
 
 #endif


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36071.109487.patch
Type: text/x-patch
Size: 1279 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170803/3db8c053/attachment.bin>