Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 16f6583

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of rust-lang#82270 - asquared31415:asm-syntax-directive-errors, r=nagisa
Emit error when trying to use assembler syntax directives in `asm!` The `.intel_syntax` and `.att_syntax` assembler directives should not be used, in favor of not specifying a syntax for intel, and in favor of the explicit `att_syntax` option using the inline assembly options. Closes rust-lang#79869
2 parents 90797ef + 4b13b81 commit 16f6583

File tree

5 files changed

+181
-1
lines changed

5 files changed

+181
-1
lines changed

‎compiler/rustc_builtin_macros/src/asm.rs‎

Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ use rustc_errors::{Applicability, DiagnosticBuilder};
77
use rustc_expand::base::{self, *};
88
use rustc_parse::parser::Parser;
99
use rustc_parse_format as parse;
10-
use rustc_span::symbol::{kw, sym, Symbol};
10+
use rustc_span::{
11+
symbol::{kw, sym, Symbol},
12+
BytePos,
13+
};
1114
use rustc_span::{InnerSpan, Span};
1215

1316
struct AsmArgs {
@@ -399,6 +402,8 @@ fn expand_preparsed_asm(ecx: &mut ExtCtxt<'_>, sp: Span, args: AsmArgs) -> P<ast
399402
let mut line_spans = Vec::with_capacity(args.templates.len());
400403
let mut curarg = 0;
401404

405+
let default_dialect = ecx.sess.inline_asm_dialect();
406+
402407
for template_expr in args.templates.into_iter() {
403408
if !template.is_empty() {
404409
template.push(ast::InlineAsmTemplatePiece::String("\n".to_string()));
@@ -424,6 +429,60 @@ fn expand_preparsed_asm(ecx: &mut ExtCtxt<'_>, sp: Span, args: AsmArgs) -> P<ast
424429

425430
let template_str = &template_str.as_str();
426431
let template_snippet = ecx.source_map().span_to_snippet(template_sp).ok();
432+
433+
if let Some(snippet) = &template_snippet {
434+
let snippet = snippet.trim_matches('"');
435+
match default_dialect {
436+
ast::LlvmAsmDialect::Intel => {
437+
if let Some(span) = check_syntax_directive(snippet, ".intel_syntax") {
438+
let span = template_span.from_inner(span);
439+
let mut err = ecx.struct_span_err(span, "intel syntax is the default syntax on this target, and trying to use this directive may cause issues");
440+
err.span_suggestion(
441+
span,
442+
"remove this assembler directive",
443+
"".to_string(),
444+
Applicability::MachineApplicable,
445+
);
446+
err.emit();
447+
}
448+
449+
if let Some(span) = check_syntax_directive(snippet, ".att_syntax") {
450+
let span = template_span.from_inner(span);
451+
let mut err = ecx.struct_span_err(span, "using the .att_syntax directive may cause issues, use the att_syntax option instead");
452+
let asm_end = sp.hi() - BytePos(2);
453+
let suggestions = vec![
454+
(span, "".to_string()),
455+
(
456+
Span::new(asm_end, asm_end, sp.ctxt()),
457+
", options(att_syntax)".to_string(),
458+
),
459+
];
460+
err.multipart_suggestion(
461+
"remove the assembler directive and replace it with options(att_syntax)",
462+
suggestions,
463+
Applicability::MachineApplicable,
464+
);
465+
err.emit();
466+
}
467+
}
468+
ast::LlvmAsmDialect::Att => {
469+
if let Some(span) = check_syntax_directive(snippet, ".att_syntax") {
470+
let span = template_span.from_inner(span);
471+
let mut err = ecx.struct_span_err(span, "att syntax is the default syntax on this target, and trying to use this directive may cause issues");
472+
err.span_suggestion(
473+
span,
474+
"remove this assembler directive",
475+
"".to_string(),
476+
Applicability::MachineApplicable,
477+
);
478+
err.emit();
479+
}
480+
481+
// Use of .intel_syntax is ignored
482+
}
483+
}
484+
}
485+
427486
let mut parser = parse::Parser::new(
428487
template_str,
429488
str_style,
@@ -631,3 +690,15 @@ pub fn expand_asm<'cx>(
631690
}
632691
}
633692
}
693+
694+
fn check_syntax_directive<S: AsRef<str>>(piece: S, syntax: &str) -> Option<InnerSpan> {
695+
let piece = piece.as_ref();
696+
if let Some(idx) = piece.find(syntax) {
697+
let end =
698+
idx + &piece[idx..].find(|c| matches!(c, '\n' | ';')).unwrap_or(piece[idx..].len());
699+
// Offset by one because these represent the span with the " removed
700+
Some(InnerSpan::new(idx + 1, end + 1))
701+
} else {
702+
None
703+
}
704+
}

‎compiler/rustc_session/src/session.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,13 @@ impl Session {
793793
}
794794
}
795795

796+
pub fn inline_asm_dialect(&self) -> rustc_ast::LlvmAsmDialect {
797+
match self.asm_arch {
798+
Some(InlineAsmArch::X86 | InlineAsmArch::X86_64) => rustc_ast::LlvmAsmDialect::Intel,
799+
_ => rustc_ast::LlvmAsmDialect::Att,
800+
}
801+
}
802+
796803
pub fn relocation_model(&self) -> RelocModel {
797804
self.opts.cg.relocation_model.unwrap_or(self.target.relocation_model)
798805
}

‎src/test/ui/asm/inline-syntax.arm.stderr‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: att syntax is the default syntax on this target, and trying to use this directive may cause issues
2+
--> $DIR/inline-syntax.rs:22:15
3+
|
4+
LL | asm!(".att_syntax noprefix", "nop");
5+
| ^^^^^^^^^^^^^^^^^^^^ help: remove this assembler directive
6+
7+
error: att syntax is the default syntax on this target, and trying to use this directive may cause issues
8+
--> $DIR/inline-syntax.rs:25:15
9+
|
10+
LL | asm!(".att_syntax bbb noprefix", "nop");
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this assembler directive
12+
13+
error: aborting due to 2 previous errors
14+

‎src/test/ui/asm/inline-syntax.rs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// revisions: x86_64 arm
2+
//[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
3+
//[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
4+
5+
#![feature(no_core, lang_items, rustc_attrs)]
6+
#![no_core]
7+
8+
#[rustc_builtin_macro]
9+
macro_rules! asm {
10+
() => {};
11+
}
12+
13+
#[lang = "sized"]
14+
trait Sized {}
15+
16+
fn main() {
17+
unsafe {
18+
asm!(".intel_syntax noprefix", "nop");
19+
//[x86_64]~^ ERROR intel syntax is the default syntax on this target
20+
asm!(".intel_syntax aaa noprefix", "nop");
21+
//[x86_64]~^ ERROR intel syntax is the default syntax on this target
22+
asm!(".att_syntax noprefix", "nop");
23+
//[x86_64]~^ ERROR using the .att_syntax directive may cause issues
24+
//[arm]~^^ att syntax is the default syntax on this target
25+
asm!(".att_syntax bbb noprefix", "nop");
26+
//[x86_64]~^ ERROR using the .att_syntax directive may cause issues
27+
//[arm]~^^ att syntax is the default syntax on this target
28+
asm!(".intel_syntax noprefix; nop");
29+
//[x86_64]~^ ERROR intel syntax is the default syntax on this target
30+
31+
asm!(
32+
r"
33+
.intel_syntax noprefix
34+
nop"
35+
);
36+
//[x86_64]~^^^ ERROR intel syntax is the default syntax on this target
37+
}
38+
}

‎src/test/ui/asm/inline-syntax.x86_64.stderr‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
error: intel syntax is the default syntax on this target, and trying to use this directive may cause issues
2+
--> $DIR/inline-syntax.rs:18:15
3+
|
4+
LL | asm!(".intel_syntax noprefix", "nop");
5+
| ^^^^^^^^^^^^^^^^^^^^^^ help: remove this assembler directive
6+
7+
error: intel syntax is the default syntax on this target, and trying to use this directive may cause issues
8+
--> $DIR/inline-syntax.rs:20:15
9+
|
10+
LL | asm!(".intel_syntax aaa noprefix", "nop");
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this assembler directive
12+
13+
error: using the .att_syntax directive may cause issues, use the att_syntax option instead
14+
--> $DIR/inline-syntax.rs:22:15
15+
|
16+
LL | asm!(".att_syntax noprefix", "nop");
17+
| ^^^^^^^^^^^^^^^^^^^^
18+
|
19+
help: remove the assembler directive and replace it with options(att_syntax)
20+
|
21+
LL | asm!("", "nop", options(att_syntax));
22+
| -- ^^^^^^^^^^^^^^^^^^^^^
23+
24+
error: using the .att_syntax directive may cause issues, use the att_syntax option instead
25+
--> $DIR/inline-syntax.rs:25:15
26+
|
27+
LL | asm!(".att_syntax bbb noprefix", "nop");
28+
| ^^^^^^^^^^^^^^^^^^^^^^^^
29+
|
30+
help: remove the assembler directive and replace it with options(att_syntax)
31+
|
32+
LL | asm!("", "nop", options(att_syntax));
33+
| -- ^^^^^^^^^^^^^^^^^^^^^
34+
35+
error: intel syntax is the default syntax on this target, and trying to use this directive may cause issues
36+
--> $DIR/inline-syntax.rs:28:15
37+
|
38+
LL | asm!(".intel_syntax noprefix; nop");
39+
| ^^^^^^^^^^^^^^^^^^^^^^ help: remove this assembler directive
40+
41+
error: intel syntax is the default syntax on this target, and trying to use this directive may cause issues
42+
--> $DIR/inline-syntax.rs:33:14
43+
|
44+
LL | .intel_syntax noprefix
45+
| ______________^
46+
LL | | nop"
47+
| |_ help: remove this assembler directive
48+
49+
error: aborting due to 6 previous errors
50+

0 commit comments

Comments
 (0)