Rollup merge of rust-lang#75939 - Amanieu:fix_asm2, r=nagisa

Fix a typo in rust-lang#75781
pietroalbini · Aug 28, 2020 · a53fdbe · a53fdbe
2 parents e30a8d4 + 178c1bb
commit a53fdbe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/librustc_codegen_llvm/asm.rs b/src/librustc_codegen_llvm/asm.rs
@@ -485,7 +485,7 @@ fn reg_to_llvm(reg: InlineAsmRegOrRegClass, layout: Option<&TyAndLayout<'tcx>>)
                 format!("{{{}{}}}", class, idx)
             } else if reg == InlineAsmReg::AArch64(AArch64InlineAsmReg::x30) {
                 // LLVM doesn't recognize x30
-                "lr".to_string()
+                "{lr}".to_string()
             } else {
                 format!("{{{}}}", reg.name())
             }

diff --git a/src/test/assembly/asm/aarch64-types.rs b/src/test/assembly/asm/aarch64-types.rs
@@ -555,6 +555,11 @@ check_reg!(v0_f32x4 f32x4 "s0" "fmov");
 check_reg!(v0_f64x2 f64x2 "s0" "fmov");
 
 // Regression test for #75761
+// CHECK-LABEL: issue_75761:
+// CHECK: stp {{{.*}}}lr
+// CHECK: //APP
+// CHECK: //NO_APP
+// CHECK: ldp {{{.*}}}lr
 pub unsafe fn issue_75761() {
     asm!("", out("v0") _, out("x30") _);
 }