Skip to content

Commit 0c2d600

Browse files
authored
Rollup merge of rust-lang#140862 - dpaoliello:arm64ecfp, r=wesleywiser
Enable non-leaf Frame Pointers for Arm64EC Windows This was enabled for native Arm64 via rust-lang#140828 r? ``@workingjubilee``
2 parents a59f427 + 35679ba commit 0c2d600

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

compiler/rustc_target/src/spec/targets/arm64ec_pc_windows_msvc.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{LinkerFlavor, Lld, Target, TargetMetadata, add_link_args, base};
1+
use crate::spec::{FramePointer, LinkerFlavor, Lld, Target, TargetMetadata, add_link_args, base};
22

33
pub(crate) fn target() -> Target {
44
let mut base = base::windows_msvc::opts();
@@ -10,6 +10,12 @@ pub(crate) fn target() -> Target {
1010
&["/machine:arm64ec", "softintrin.lib"],
1111
);
1212

13+
// Microsoft recommends enabling frame pointers on Arm64 Windows.
14+
// From https://learn.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions?view=msvc-170#integer-registers
15+
// "The frame pointer (x29) is required for compatibility with fast stack walking used by ETW
16+
// and other services. It must point to the previous {x29, x30} pair on the stack."
17+
base.frame_pointer = FramePointer::NonLeaf;
18+
1319
Target {
1420
llvm_target: "arm64ec-pc-windows-msvc".into(),
1521
metadata: TargetMetadata {

tests/assembly/asm/aarch64-types.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ pub unsafe fn sym_static() {
8686

8787
// Regression test for #75761
8888
// CHECK-LABEL: {{("#)?}}issue_75761{{"?}}
89-
// CHECK: str {{.*}}x30
89+
// aarch64: str {{.*}}x30
90+
// arm64ec: stp {{.*}}x30
9091
// CHECK: //APP
9192
// CHECK: //NO_APP
92-
// CHECK: ldr {{.*}}x30
93+
// aarch64: ldr {{.*}}x30
94+
// arm64ec: ldp {{.*}}x30
9395
#[no_mangle]
9496
pub unsafe fn issue_75761() {
9597
asm!("", out("v0") _, out("x30") _);

0 commit comments

Comments
 (0)