Update tests to use llvm_asm!

Author: Amanieu

src/librustc_error_codes/error_codes/E0668.md

@@ -7,7 +7,7 @@ assembly call.
 In particular, it can happen if you forgot the closing bracket of a register
 constraint (see issue #51430):
 ```compile_fail,E0668
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 fn main() {
  let rax: u64;

src/test/codegen/no-output-asm-is-volatile.rs

@@ -1,6 +1,6 @@
 // compile-flags: -O
 
-#![feature(asm)]
+#![feature(llvm_asm)]
 #![crate_type = "lib"]
 
 // Check that inline assembly expressions without any outputs
@@ -9,6 +9,6 @@
 // CHECK-LABEL: @assembly
 #[no_mangle]
 pub fn assembly() {
- unsafe { asm!("") }
+ unsafe { llvm_asm!("") }
 // CHECK: tail call void asm sideeffect "", {{.*}}
 }

src/test/compile-fail/asm-src-loc-codegen-units.rs

@@ -3,10 +3,10 @@
 // compile-flags: -C codegen-units=2
 // ignore-emscripten
 
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 fn main() {
  unsafe {
- asm!("nowayisthisavalidinstruction"); //~ ERROR instruction
+ llvm_asm!("nowayisthisavalidinstruction"); //~ ERROR instruction
  }
 }

src/test/compile-fail/asm-src-loc.rs

@@ -1,9 +1,9 @@
 // ignore-emscripten
 
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 fn main() {
  unsafe {
- asm!("nowayisthisavalidinstruction"); //~ ERROR instruction
+ llvm_asm!("nowayisthisavalidinstruction"); //~ ERROR instruction
  }
 }

src/test/incremental/hashes/inline_asm.rs

@@ -11,7 +11,7 @@
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
-#![feature(asm)]
+#![feature(llvm_asm)]
 #![crate_type="rlib"]
 
 
@@ -22,12 +22,12 @@
 pub fn change_template(a: i32) -> i32 {
  let c: i32;
  unsafe {
- asm!("add 1, $0"
- : "=r"(c)
- : "0"(a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(c)
+  : "0"(a)
+  :
+  :
+  );
  }
  c
 }
@@ -39,12 +39,12 @@ pub fn change_template(a: i32) -> i32 {
 pub fn change_template(a: i32) -> i32 {
  let c: i32;
  unsafe {
- asm!("add 2, $0"
- : "=r"(c)
- : "0"(a)
- :
- :
- );
+ llvm_asm!("add 2, $0"
+  : "=r"(c)
+  : "0"(a)
+  :
+  :
+  );
  }
  c
 }
@@ -58,12 +58,12 @@ pub fn change_output(a: i32) -> i32 {
  let mut _out1: i32 = 0;
  let mut _out2: i32 = 0;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out1)
- : "0"(a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out1)
+  : "0"(a)
+  :
+  :
+  );
  }
  _out1
 }
@@ -76,12 +76,12 @@ pub fn change_output(a: i32) -> i32 {
  let mut _out1: i32 = 0;
  let mut _out2: i32 = 0;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out2)
- : "0"(a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out2)
+  : "0"(a)
+  :
+  :
+  );
  }
  _out1
 }
@@ -94,12 +94,12 @@ pub fn change_output(a: i32) -> i32 {
 pub fn change_input(_a: i32, _b: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a)
+  :
+  :
+  );
  }
  _out
 }
@@ -111,12 +111,12 @@ pub fn change_input(_a: i32, _b: i32) -> i32 {
 pub fn change_input(_a: i32, _b: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_b)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_b)
+  :
+  :
+  );
  }
  _out
 }
@@ -129,12 +129,12 @@ pub fn change_input(_a: i32, _b: i32) -> i32 {
 pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a), "r"(_b)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a), "r"(_b)
+  :
+  :
+  );
  }
  _out
 }
@@ -146,12 +146,12 @@ pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
 pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "r"(_a), "0"(_b)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "r"(_a), "0"(_b)
+  :
+  :
+  );
  }
  _out
 }
@@ -164,12 +164,12 @@ pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
 pub fn change_clobber(_a: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a)
+  :
+  :
+  );
  }
  _out
 }
@@ -181,12 +181,12 @@ pub fn change_clobber(_a: i32) -> i32 {
 pub fn change_clobber(_a: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a)
- : "eax"
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a)
+  : "eax"
+  :
+  );
  }
  _out
 }
@@ -199,12 +199,12 @@ pub fn change_clobber(_a: i32) -> i32 {
 pub fn change_options(_a: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a)
- :
- :
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a)
+  :
+  :
+  );
  }
  _out
 }
@@ -216,12 +216,12 @@ pub fn change_options(_a: i32) -> i32 {
 pub fn change_options(_a: i32) -> i32 {
  let _out;
  unsafe {
- asm!("add 1, $0"
- : "=r"(_out)
- : "0"(_a)
- :
- : "volatile"
- );
+ llvm_asm!("add 1, $0"
+  : "=r"(_out)
+  : "0"(_a)
+  :
+  : "volatile"
+  );
  }
  _out
 }

src/test/mir-opt/unreachable_asm.rs

@@ -1,5 +1,5 @@
 // ignore-tidy-linelength
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 enum Empty {}
 
@@ -18,7 +18,7 @@ fn main() {
  }
 
  // asm instruction stops unreachable propagation to if else blocks bb4 and bb5.
- unsafe { asm!("NOP"); }
+ unsafe { llvm_asm!("NOP"); }
  match _x { }
  }
 }
@@ -39,7 +39,7 @@ fn main() {
 // StorageDead(_6);
 // StorageDead(_5);
 // StorageLive(_7);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _7 = ();
 // StorageDead(_7);
 // StorageLive(_8);
@@ -62,7 +62,7 @@ fn main() {
 // StorageDead(_6);
 // StorageDead(_5);
 // StorageLive(_7);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _7 = ();
 // StorageDead(_7);
 // StorageLive(_8);

src/test/mir-opt/unreachable_asm_2.rs

@@ -1,5 +1,5 @@
 // ignore-tidy-linelength
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 enum Empty {}
 
@@ -13,11 +13,11 @@ fn main() {
 
  if true {
  // asm instruction stops unreachable propagation to block bb3.
- unsafe { asm!("NOP"); }
+ unsafe { llvm_asm!("NOP"); }
  _y = 21;
  } else {
  // asm instruction stops unreachable propagation to block bb3.
- unsafe { asm!("NOP"); }
+ unsafe { llvm_asm!("NOP"); }
  _y = 42;
  }
 
@@ -33,7 +33,7 @@ fn main() {
 // }
 // bb4: {
 // StorageLive(_8);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _8 = ();
 // StorageDead(_8);
 // _4 = const 42i32;
@@ -42,7 +42,7 @@ fn main() {
 // }
 // bb5: {
 // StorageLive(_7);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _7 = ();
 // StorageDead(_7);
 // _4 = const 21i32;
@@ -64,7 +64,7 @@ fn main() {
 // }
 // bb4: {
 // StorageLive(_8);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _8 = ();
 // StorageDead(_8);
 // _4 = const 42i32;
@@ -73,7 +73,7 @@ fn main() {
 // }
 // bb5: {
 // StorageLive(_7);
-// asm!(InlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
+// llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []);
 // _7 = ();
 // StorageDead(_7);
 // _4 = const 21i32;

src/test/pretty/asm-clobbers.rs

@@ -1,3 +1,3 @@
-#![feature(asm)]
+#![feature(llvm_asm)]
 
-pub fn main() { unsafe { asm!("" : : : "hello", "world") }; }
+pub fn main() { unsafe { llvm_asm!("" : : : "hello", "world") }; }

src/test/pretty/asm-options.rs

@@ -1,11 +1,11 @@
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 // pp-exact
 
 pub fn main() {
  unsafe {
- asm!("" : : : : "volatile");
- asm!("" : : : : "alignstack");
- asm!("" : : : : "intel");
+ llvm_asm!("" : : : : "volatile");
+ llvm_asm!("" : : : : "alignstack");
+ llvm_asm!("" : : : : "intel");
  }
 }