Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trigger unsafe_code lint on invocations of global_asm #121318

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_builtin_macros/src/asm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ pub(super) fn expand_global_asm<'cx>(
kind: ast::VisibilityKind::Inherited,
tokens: None,
},
span: ecx.with_def_site_ctxt(sp),
span: sp,
tokens: None,
})])
} else {
Expand Down
5 changes: 4 additions & 1 deletion compiler/rustc_lint/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ lint_builtin_explicit_outlives = outlives requirements can be inferred
lint_builtin_export_name_fn = declaration of a function with `export_name`
lint_builtin_export_name_method = declaration of a method with `export_name`
lint_builtin_export_name_static = declaration of a static with `export_name`
lint_builtin_global_asm = usage of `core::arch::global_asm`
lint_builtin_global_macro_unsafety = using this macro is unsafe even though it does not need an `unsafe` block
lint_builtin_impl_unsafe_method = implementation of an `unsafe` method
lint_builtin_incomplete_features = the feature `{$name}` is incomplete and may not be safe to use and/or cause compiler crashes
Expand Down
4 changes: 4 additions & 0 deletions compiler/rustc_lint/src/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ impl EarlyLintPass for UnsafeCode {
}
}

ast::ItemKind::GlobalAsm(..) => {
self.report_unsafe(cx, it.span, BuiltinUnsafe::GlobalAsm);
}

_ => {}
}
}
Expand Down
3 changes: 3 additions & 0 deletions compiler/rustc_lint/src/lints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ pub enum BuiltinUnsafe {
DeclUnsafeMethod,
#[diag(lint_builtin_impl_unsafe_method)]
ImplUnsafeMethod,
#[diag(lint_builtin_global_asm)]
#[note(lint_builtin_global_macro_unsafety)]
GlobalAsm,
}

#[derive(LintDiagnostic)]
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/asm/bad-arch.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ error[E0472]: inline assembly is unsupported on this target
|
LL | global_asm!("");
| ^^^^^^^^^^^^^^^
|
= note: this error originates in the macro `global_asm` (in Nightly builds, run with -Z macro-backtrace for more info)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice diagnostic improvement here from the span change 👍


error: aborting due to 2 previous errors

Expand Down
20 changes: 20 additions & 0 deletions tests/ui/lint/unsafe_code/lint-global-asm-as-unsafe.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//@ needs-asm-support
#![deny(unsafe_code)]

use std::arch::global_asm;

#[allow(unsafe_code)]
mod allowed_unsafe {
std::arch::global_asm!("");
}

macro_rules! unsafe_in_macro {
() => {
global_asm!(""); //~ ERROR: usage of `core::arch::global_asm`
};
}

global_asm!(""); //~ ERROR: usage of `core::arch::global_asm`
unsafe_in_macro!();

fn main() {}
27 changes: 27 additions & 0 deletions tests/ui/lint/unsafe_code/lint-global-asm-as-unsafe.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
error: usage of `core::arch::global_asm`
--> $DIR/lint-global-asm-as-unsafe.rs:17:1
|
LL | global_asm!("");
| ^^^^^^^^^^^^^^^
|
= note: using this macro is unsafe even though it does not need an `unsafe` block
note: the lint level is defined here
--> $DIR/lint-global-asm-as-unsafe.rs:2:9
|
LL | #![deny(unsafe_code)]
| ^^^^^^^^^^^

error: usage of `core::arch::global_asm`
--> $DIR/lint-global-asm-as-unsafe.rs:13:9
|
LL | global_asm!("");
| ^^^^^^^^^^^^^^^
...
LL | unsafe_in_macro!();
| ------------------ in this macro invocation
|
= note: using this macro is unsafe even though it does not need an `unsafe` block
= note: this error originates in the macro `unsafe_in_macro` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to 2 previous errors

Loading