Fix #124375

Author: folkertdev

compiler/rustc_codegen_ssa/src/mir/naked_asm.rs

@@ -33,9 +33,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         let (begin, end) = crate::mir::naked_asm::prefix_and_suffix(cx.tcx(), instance, item_data);
 
         let mut template_vec = Vec::new();
-        template_vec.push(rustc_ast::ast::InlineAsmTemplatePiece::String(begin));
+        template_vec.push(rustc_ast::ast::InlineAsmTemplatePiece::String(begin.into()));
         template_vec.extend(template.iter().cloned());
-        template_vec.push(rustc_ast::ast::InlineAsmTemplatePiece::String(end));
+        template_vec.push(rustc_ast::ast::InlineAsmTemplatePiece::String(end.into()));
 
         cx.codegen_global_asm(&template_vec, &operands, options, line_spans);
     }
@@ -178,9 +178,6 @@ fn prefix_and_suffix<'tcx>(
                 writeln!(begin, ".hidden {asm_name}").unwrap();
             }
             writeln!(begin, ".type {asm_name}, {function}").unwrap();
-            if let Some(instruction_set) = attrs.instruction_set {
-                writeln!(begin, "{}", instruction_set.as_str()).unwrap();
-            }
             if !arch_prefix.is_empty() {
                 writeln!(begin, "{}", arch_prefix).unwrap();
             }
@@ -203,9 +200,6 @@ fn prefix_and_suffix<'tcx>(
             if let Visibility::Hidden = item_data.visibility {
                 writeln!(begin, ".private_extern {asm_name}").unwrap();
             }
-            if let Some(instruction_set) = attrs.instruction_set {
-                writeln!(begin, "{}", instruction_set.as_str()).unwrap();
-            }
             writeln!(begin, "{asm_name}:").unwrap();
 
             writeln!(end).unwrap();
@@ -225,9 +219,6 @@ fn prefix_and_suffix<'tcx>(
             writeln!(begin, ".scl 2").unwrap();
             writeln!(begin, ".type 32").unwrap();
             writeln!(begin, ".endef {asm_name}").unwrap();
-            if let Some(instruction_set) = attrs.instruction_set {
-                writeln!(begin, "{}", instruction_set.as_str()).unwrap();
-            }
             writeln!(begin, "{asm_name}:").unwrap();
 
             writeln!(end).unwrap();

tests/crashes/124375.rs

@@ -24,7 +24,7 @@ unsafe extern "C" fn test_thumb() {
 
 #[no_mangle]
 #[naked]
-#[instruction_set(arm::t32)]
+#[instruction_set(arm::a32)]
 unsafe extern "C" fn test_arm() {
     asm!("bx lr", options(noreturn));
 }

tests/ui/asm/naked-functions-instruction-set.rs

@@ -182,6 +182,12 @@ pub unsafe extern "C" fn invalid_asm_syntax(a: u32) -> u32 {
     //~^ ERROR asm template must be a string literal
 }
 
+// this previously ICE'd, see https://github.com/rust-lang/rust/issues/124375
+#[naked]
+pub unsafe extern "C" fn naked_with_args_and_return(a: isize, b: isize) -> isize {
+    asm!("lea rax, [rdi + rsi]", "ret", options(noreturn));
+}
+
 #[cfg(target_arch = "x86_64")]
 #[cfg_attr(target_pointer_width = "64", no_mangle)]
 #[naked]