Skip to content

Make panic unwind the default for aarch64-*-windows-msvc targets #70704

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.

Sign up for GitHub

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

Merged
bors merged 1 commit into from
Apr 6, 2020
Merged

Make panic unwind the default for aarch64-*-windows-msvc targets #70704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions src/libpanic_unwind/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ cfg_if::cfg_if! {
} else if #[cfg(target_os = "hermit")] {
#[path = "hermit.rs"]
mod real_imp;
} else if #[cfg(all(target_env = "msvc", target_arch = "aarch64"))] {
#[path = "dummy.rs"]
mod real_imp;
} else if #[cfg(target_env = "msvc")] {
#[path = "seh.rs"]
mod real_imp;
Expand Down
2 changes: 1 addition & 1 deletion src/libpanic_unwind/seh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ mod imp {
}
}

#[cfg(any(target_arch = "x86_64", target_arch = "arm"))]
#[cfg(not(target_arch = "x86"))]
#[macro_use]
mod imp {
pub type ptr_t = u32;
Expand Down
5 changes: 1 addition & 4 deletions src/librustc_target/spec/aarch64_pc_windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
use crate::spec::{LinkerFlavor, PanicStrategy, Target, TargetResult};
use crate::spec::{LinkerFlavor, Target, TargetResult};

pub fn target() -> TargetResult {
let mut base = super::windows_msvc_base::opts();
base.max_atomic_width = Some(64);
base.has_elf_tls = true;
base.features = "+neon,+fp-armv8".to_string();

// FIXME: this shouldn't be panic=abort, it should be panic=unwind
base.panic_strategy = PanicStrategy::Abort;

Ok(Target {
llvm_target: "aarch64-pc-windows-msvc".to_string(),
target_endian: "little".to_string(),
Expand Down
5 changes: 1 addition & 4 deletions src/librustc_target/spec/aarch64_uwp_windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
use crate::spec::{LinkerFlavor, PanicStrategy, Target, TargetResult};
use crate::spec::{LinkerFlavor, Target, TargetResult};

pub fn target() -> TargetResult {
let mut base = super::windows_uwp_msvc_base::opts();
base.max_atomic_width = Some(64);
base.has_elf_tls = true;

// FIXME: this shouldn't be panic=abort, it should be panic=unwind
base.panic_strategy = PanicStrategy::Abort;

Ok(Target {
llvm_target: "aarch64-pc-windows-msvc".to_string(),
target_endian: "little".to_string(),
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated 8 files
+7 −0 llvm/include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
+57 −43 llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
+62 −0 llvm/test/CodeGen/AArch64/funclet-match-add-sub-stack.ll
+12 −12 llvm/test/CodeGen/AArch64/seh-finally.ll
+3 −4 llvm/test/CodeGen/AArch64/wineh-try-catch-cbz.ll
+1 −1 llvm/test/CodeGen/AArch64/wineh-try-catch-realign.ll
+11 −11 llvm/test/CodeGen/AArch64/wineh-try-catch.ll
+69 −0 llvm/test/CodeGen/AArch64/wineh-unwindhelp-via-fp.ll