Merge #223

223: Use llvm_asm! instead of asm! r=Amanieu a=Amanieu `asm!` will be deprecated soon in preparation for the new `asm!` macro, so switch to using `llvm_asm!` instead. cc rust-lang/rfcs#2843 Co-authored-by: Amanieu d'Antras <amanieu@gmail.com>
Amanieu · Apr 9, 2020 · 4e87a4b · 4e87a4b
2 parents 9bed8e3 + dce000d
commit 4e87a4b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/src/elision.rs b/src/elision.rs
@@ -57,11 +57,11 @@ impl AtomicElisionExt for AtomicUsize {
     fn elision_compare_exchange_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
         unsafe {
             let prev: usize;
-            asm!("xacquire; lock; cmpxchgl $2, $1"
-                 : "={eax}" (prev), "+*m" (self)
-                 : "r" (new), "{eax}" (current)
-                 : "memory"
-                 : "volatile");
+            llvm_asm!("xacquire; lock; cmpxchgl $2, $1"
+                      : "={eax}" (prev), "+*m" (self)
+                      : "r" (new), "{eax}" (current)
+                      : "memory"
+                      : "volatile");
             if prev == current {
                 Ok(prev)
             } else {
@@ -74,11 +74,11 @@ impl AtomicElisionExt for AtomicUsize {
     fn elision_compare_exchange_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
         unsafe {
             let prev: usize;
-            asm!("xacquire; lock; cmpxchgq $2, $1"
-                 : "={rax}" (prev), "+*m" (self)
-                 : "r" (new), "{rax}" (current)
-                 : "memory"
-                 : "volatile");
+            llvm_asm!("xacquire; lock; cmpxchgq $2, $1"
+                      : "={rax}" (prev), "+*m" (self)
+                      : "r" (new), "{rax}" (current)
+                      : "memory"
+                      : "volatile");
             if prev == current {
                 Ok(prev)
             } else {
@@ -92,11 +92,11 @@ impl AtomicElisionExt for AtomicUsize {
     fn elision_fetch_sub_release(&self, val: usize) -> usize {
         unsafe {
             let prev: usize;
-            asm!("xrelease; lock; xaddl $2, $1"
-                 : "=r" (prev), "+*m" (self)
-                 : "0" (val.wrapping_neg())
-                 : "memory"
-                 : "volatile");
+            llvm_asm!("xrelease; lock; xaddl $2, $1"
+                      : "=r" (prev), "+*m" (self)
+                      : "0" (val.wrapping_neg())
+                      : "memory"
+                      : "volatile");
             prev
         }
     }
@@ -105,11 +105,11 @@ impl AtomicElisionExt for AtomicUsize {
     fn elision_fetch_sub_release(&self, val: usize) -> usize {
         unsafe {
             let prev: usize;
-            asm!("xrelease; lock; xaddq $2, $1"
-                 : "=r" (prev), "+*m" (self)
-                 : "0" (val.wrapping_neg())
-                 : "memory"
-                 : "volatile");
+            llvm_asm!("xrelease; lock; xaddq $2, $1"
+                      : "=r" (prev), "+*m" (self)
+                      : "0" (val.wrapping_neg())
+                      : "memory"
+                      : "volatile");
             prev
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -11,7 +11,7 @@
 
 #![warn(missing_docs)]
 #![warn(rust_2018_idioms)]
-#![cfg_attr(feature = "nightly", feature(asm))]
+#![cfg_attr(feature = "nightly", feature(llvm_asm))]
 
 mod condvar;
 mod elision;