bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reject may_unwind option in naked functions

Browse source
This commit is contained in:
Tomasz Miąsko 2022-01-21 00:00:00 +00:00
parent 888332fee4
commit beeba4bcea
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_passes/src/naked_functions.rs
View file

@ -251,6 +251,7 @@ impl<'tcx> CheckInlineAssembly<'tcx> {
} }
let unsupported_options: Vec<&'static str> = [ let unsupported_options: Vec<&'static str> = [
(InlineAsmOptions::MAY_UNWIND, "`may_unwind`"),
(InlineAsmOptions::NOMEM, "`nomem`"), (InlineAsmOptions::NOMEM, "`nomem`"),
(InlineAsmOptions::NOSTACK, "`nostack`"), (InlineAsmOptions::NOSTACK, "`nostack`"),
(InlineAsmOptions::PRESERVES_FLAGS, "`preserves_flags`"), (InlineAsmOptions::PRESERVES_FLAGS, "`preserves_flags`"),

8
src/test/ui/asm/naked-functions.rs
View file

@ -5,7 +5,7 @@
#![feature(naked_functions)] #![feature(naked_functions)]
#![feature(or_patterns)] #![feature(or_patterns)]
#![feature(asm_const, asm_sym)] #![feature(asm_const, asm_sym, asm_unwind)]
#![crate_type = "lib"] #![crate_type = "lib"]
use std::arch::asm; use std::arch::asm;
@ -114,6 +114,12 @@ unsafe extern "C" fn invalid_options_continued() {
//~| ERROR asm in naked functions must use `noreturn` option //~| ERROR asm in naked functions must use `noreturn` option
} }
#[naked]
unsafe extern "C" fn invalid_may_unwind() {
asm!("", options(noreturn, may_unwind));
//~^ ERROR asm options unsupported in naked functions: `may_unwind`
}
#[naked] #[naked]
pub unsafe fn default_abi() { pub unsafe fn default_abi() {
//~^ WARN Rust ABI is unsupported in naked functions //~^ WARN Rust ABI is unsupported in naked functions

24
src/test/ui/asm/naked-functions.stderr
View file

@ -199,8 +199,14 @@ error[E0787]: asm in naked functions must use `noreturn` option
LL | asm!("", options(readonly, nostack), options(pure)); LL | asm!("", options(readonly, nostack), options(pure));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0787]: asm options unsupported in naked functions: `may_unwind`
--> $DIR/naked-functions.rs:119:5
|
LL | asm!("", options(noreturn, may_unwind));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
warning: Rust ABI is unsupported in naked functions warning: Rust ABI is unsupported in naked functions
--> $DIR/naked-functions.rs:118:15 --> $DIR/naked-functions.rs:124:15
| |
LL | pub unsafe fn default_abi() { LL | pub unsafe fn default_abi() {
| ^^^^^^^^^^^ | ^^^^^^^^^^^
@ -208,47 +214,47 @@ LL | pub unsafe fn default_abi() {
= note: `#[warn(undefined_naked_function_abi)]` on by default = note: `#[warn(undefined_naked_function_abi)]` on by default
warning: Rust ABI is unsupported in naked functions warning: Rust ABI is unsupported in naked functions
--> $DIR/naked-functions.rs:124:15 --> $DIR/naked-functions.rs:130:15
| |
LL | pub unsafe fn rust_abi() { LL | pub unsafe fn rust_abi() {
| ^^^^^^^^ | ^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:164:1 --> $DIR/naked-functions.rs:170:1
| |
LL | #[inline] LL | #[inline]
| ^^^^^^^^^ | ^^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:171:1 --> $DIR/naked-functions.rs:177:1
| |
LL | #[inline(always)] LL | #[inline(always)]
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:178:1 --> $DIR/naked-functions.rs:184:1
| |
LL | #[inline(never)] LL | #[inline(never)]
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:185:1 --> $DIR/naked-functions.rs:191:1
| |
LL | #[inline] LL | #[inline]
| ^^^^^^^^^ | ^^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:187:1 --> $DIR/naked-functions.rs:193:1
| |
LL | #[inline(always)] LL | #[inline(always)]
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
error: naked functions cannot be inlined error: naked functions cannot be inlined
--> $DIR/naked-functions.rs:189:1 --> $DIR/naked-functions.rs:195:1
| |
LL | #[inline(never)] LL | #[inline(never)]
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
error: aborting due to 29 previous errors; 2 warnings emitted error: aborting due to 30 previous errors; 2 warnings emitted
For more information about this error, try `rustc --explain E0787`. For more information about this error, try `rustc --explain E0787`.