-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #124655 - Darksonn:fixed-x18, r=lqd,estebank
Add `-Zfixed-x18` This PR is a follow-up to #124323 that proposes a different implementation. Please read the description of that PR for motivation. See the equivalent flag in [the clang docs](https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-ffixed-x18). MCP: rust-lang/compiler-team#748 Fixes #121970 r? rust-lang/compiler
- Loading branch information
Showing
8 changed files
with
100 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# `fixed-x18` | ||
|
||
This option prevents the compiler from using the x18 register. It is only | ||
supported on aarch64. | ||
|
||
From the [ABI spec][arm-abi]: | ||
|
||
> X18 is the platform register and is reserved for the use of platform ABIs. | ||
> This is an additional temporary register on platforms that don't assign a | ||
> special meaning to it. | ||
This flag only has an effect when the x18 register would otherwise be considered | ||
a temporary register. When the flag is applied, x18 is always a reserved | ||
register. | ||
|
||
This flag is intended for use with the shadow call stack sanitizer. Generally, | ||
when that sanitizer is enabled, the x18 register is used to store a pointer to | ||
the shadow stack. Enabling this flag prevents the compiler from overwriting the | ||
shadow stack pointer with temporary data, which is necessary for the sanitizer | ||
to work correctly. | ||
|
||
Currently, the `-Zsanitizer=shadow-call-stack` flag is only supported on | ||
platforms that always treat x18 as a reserved register, and the `-Zfixed-x18` | ||
flag is not required to use the sanitizer on such platforms. However, the | ||
sanitizer may be supported on targets where this is not the case in the future. | ||
|
||
It is undefined behavior for `-Zsanitizer=shadow-call-stack` code to call into | ||
code where x18 is a temporary register. On the other hand, when you are *not* | ||
using the shadow call stack sanitizer, compilation units compiled with and | ||
without the `-Zfixed-x18` flag are compatible with each other. | ||
|
||
[arm-abi]: https://developer.arm.com/documentation/den0024/a/The-ABI-for-ARM-64-bit-Architecture/Register-use-in-the-AArch64-Procedure-Call-Standard/Parameters-in-general-purpose-registers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// Test that the `reserve-x18` target feature is (not) emitted when | ||
// the `-Zfixed-x18` flag is (not) set. | ||
|
||
//@ revisions: unset set | ||
//@ needs-llvm-components: aarch64 | ||
//@ compile-flags: --target aarch64-unknown-none | ||
//@ [set] compile-flags: -Zfixed-x18 | ||
|
||
#![crate_type = "lib"] | ||
#![feature(no_core, lang_items)] | ||
#![no_core] | ||
|
||
#[lang = "sized"] | ||
trait Sized {} | ||
|
||
#[no_mangle] | ||
pub fn foo() { | ||
// CHECK: @foo() unnamed_addr #0 | ||
|
||
// unset-NOT: attributes #0 = { {{.*}}"target-features"="{{[^"]*}}+reserve-x18{{.*}} } | ||
// set: attributes #0 = { {{.*}}"target-features"="{{[^"]*}}+reserve-x18{{.*}} } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// This tests that -Zfixed-x18 causes a compilation failure on targets other than aarch64. | ||
// Behavior on aarch64 is tested by tests/codegen/fixed-x18.rs. | ||
// | ||
//@ revisions: x64 i686 arm riscv32 riscv64 | ||
//@ error-pattern: the `-Zfixed-x18` flag is not supported | ||
//@ dont-check-compiler-stderr | ||
// | ||
//@ compile-flags: -Zfixed-x18 | ||
//@ [x64] needs-llvm-components: x86 | ||
//@ [x64] compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=rlib | ||
//@ [i686] needs-llvm-components: x86 | ||
//@ [i686] compile-flags: --target=i686-unknown-linux-gnu --crate-type=rlib | ||
//@ [arm] needs-llvm-components: arm | ||
//@ [arm] compile-flags: --target=armv7-unknown-linux-gnueabihf --crate-type=rlib | ||
//@ [riscv32] needs-llvm-components: riscv | ||
//@ [riscv32] compile-flags: --target=riscv32i-unknown-none-elf --crate-type=rlib | ||
//@ [riscv64] needs-llvm-components: riscv | ||
//@ [riscv64] compile-flags: --target=riscv64gc-unknown-none-elf --crate-type=rlib | ||
|
||
#![crate_type = "lib"] | ||
#![feature(no_core, lang_items)] | ||
#![no_core] | ||
|
||
#[lang = "sized"] | ||
trait Sized {} |