Skip to content

Commit 13ad118

Browse files
authored
Rollup merge of rust-lang#140755 - dpaoliello:arm64windebuginfo, r=jieyouxu
[win][arm64] Disable various DebugInfo tests that don't work on Arm64 Windows While trying to get the aarch64-msvc build working correctly (rust-lang#140136), various DebugInfo related tests were failing. I've added comments to each test to indicate why it is disabled and linked to appropriate bugs. * `tests/debuginfo/step-into-match.rs`: Stepping at the end of a function on goes to the callsite, not the instruction after it. * `tests/debuginfo/type-names.rs`: Arm64 Windows cdb doesn't support JavaScript extensions. Followed up with the Microsoft Debugger Tools team to fix this. * `tests/ui/runtime/backtrace-debuginfo.rs`: Backtraces are truncated due to rust-lang#140489
2 parents 4ed1318 + 3286d4a commit 13ad118

File tree

4 files changed

+11
-0
lines changed

4 files changed

+11
-0
lines changed

src/tools/compiletest/src/directive-list.rs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
3535
"ignore-32bit",
3636
"ignore-64bit",
3737
"ignore-aarch64",
38+
"ignore-aarch64-pc-windows-msvc",
3839
"ignore-aarch64-unknown-linux-gnu",
3940
"ignore-aix",
4041
"ignore-android",

tests/debuginfo/step-into-match.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
//@ compile-flags: -g
22
//@ ignore-android: FIXME(#10381)
33

4+
// On Arm64 Windows, stepping at the end of a function on goes to the callsite, not the instruction
5+
// after it.
6+
//@ ignore-aarch64-pc-windows-msvc: Stepping out of functions behaves differently.
7+
48
// === GDB TESTS ==============================================================
59

610
// gdb-command: r

tests/debuginfo/type-names.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//@ ignore-lldb
22

3+
//@ ignore-aarch64-pc-windows-msvc: Arm64 Windows cdb doesn't support JavaScript extensions.
4+
35
// GDB changed the way that it formatted Foreign types
46
//@ min-gdb-version: 9.2
57

tests/ui/runtime/backtrace-debuginfo.rs

+4
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,13 @@ macro_rules! dump_and_die {
4242
// there, even on i686-pc-windows-msvc. We do the best we can in
4343
// rust-lang/rust to test it as well, but sometimes we just gotta keep
4444
// landing PRs.
45+
//
46+
// aarch64-msvc is broken as its backtraces are truncated.
47+
// See https://github.com/rust-lang/rust/issues/140489
4548
if cfg!(any(target_os = "android",
4649
all(target_os = "linux", target_arch = "arm"),
4750
all(target_env = "msvc", target_arch = "x86"),
51+
all(target_env = "msvc", target_arch = "aarch64"),
4852
target_os = "freebsd",
4953
target_os = "dragonfly",
5054
target_os = "openbsd")) {

0 commit comments

Comments
 (0)