mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 00:03:43 +00:00
Auto merge of #133115 - jieyouxu:cdb, r=chrisdenton
Update cdb annotations for some debuginfo tests with cdb `10.0.26100.2161` GitHub CI runners [recently updated to Windows Server 2022 (20241113)](https://github.com/actions/runner-images/releases/tag/win22%2F20241113.3) which included Windows Software Development Kit version `10.1.26100.1742`, which transitively shipped a `cdb` version `10.0.26100.2161`. This changed some cdb output, causing 3 debuginfo tests to fail (see #133107, https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/msvc.20update.20causing.20debuginfo.20failures): ``` tests\debuginfo\numeric-types.rs tests\debuginfo\range-types.rs tests\debuginfo\unit-type.rs ``` I updated cdb annotations for these 3 tests locally with a matching `cdb` version. However, I am not by any means a cdb expert nor debuginfo expert, I just reblessed the tests to match whatever the new cdb version produces to unblock the tree. It is certainly possible that debuginfo improved/regressed/both with the newer cdb version. try-job: x86_64-msvc
This commit is contained in:
bors
commit
f2a35426b6
@ -2,6 +2,14 @@
|
||||
|
||||
//@ ignore-windows-gnu: #128981
|
||||
|
||||
// Note: u128 visualization was not supported in 10.0.22621.3233 but was fixed in 10.0.26100.2161.
|
||||
|
||||
// FIXME(#133107): this is temporarily marked as `only-64bit` because of course 32-bit msvc has
|
||||
// a different integer width and thus underlying integer type display. Only marked as such to
|
||||
// unblock the tree.
|
||||
//@ only-64bit
|
||||
//@ min-cdb-version: 10.0.26100.2161
|
||||
|
||||
// Tests the visualizations for `NonZero<T>`, `Wrapping<T>` and
|
||||
// `Atomic{Bool,I8,I16,I32,I64,Isize,U8,U16,U32,U64,Usize}` located in `libcore.natvis`.
|
||||
|
||||
@ -48,8 +56,8 @@
|
||||
// cdb-check:nz_u64 : 0x64 [Type: core::num::nonzero::NonZero<u64>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u64>]
|
||||
|
||||
// 128-bit integers don't seem to work in CDB
|
||||
// cdb-command: dx nz_u128
|
||||
// cdb-check:nz_u128 : 111 [Type: core::num::nonzero::NonZero<u128>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u128>]
|
||||
|
||||
// cdb-command: dx nz_usize
|
||||
@ -58,101 +66,99 @@
|
||||
|
||||
// cdb-command: dx w_i8
|
||||
// cdb-check:w_i8 : 10 [Type: core::num::wrapping::Wrapping<i8>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i8>]
|
||||
// cdb-check: [+0x000] __0 : 10 [Type: char]
|
||||
|
||||
// cdb-command: dx w_i16
|
||||
// cdb-check:w_i16 : 20 [Type: core::num::wrapping::Wrapping<i16>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i16>]
|
||||
// cdb-check: [+0x000] __0 : 20 [Type: short]
|
||||
|
||||
// cdb-command: dx w_i32
|
||||
// cdb-check:w_i32 : 30 [Type: core::num::wrapping::Wrapping<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i32>]
|
||||
// cdb-check: [+0x000] __0 : 30 [Type: int]
|
||||
|
||||
// cdb-command: dx w_i64
|
||||
// cdb-check:w_i64 : 40 [Type: core::num::wrapping::Wrapping<i64>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i64>]
|
||||
// cdb-check: [+0x000] __0 : 40 [Type: __int64]
|
||||
|
||||
// 128-bit integers don't seem to work in CDB
|
||||
// cdb-command: dx w_i128
|
||||
// cdb-check:w_i128 [Type: core::num::wrapping::Wrapping<i128>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i128>]
|
||||
// cdb-check:w_i128 : 50 [Type: core::num::wrapping::Wrapping<i128>]
|
||||
// cdb-check: [+0x000] __0 : 50 [Type: i128]
|
||||
|
||||
// cdb-command: dx w_isize
|
||||
// cdb-check:w_isize : 60 [Type: core::num::wrapping::Wrapping<isize>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<isize>]
|
||||
// cdb-check: [+0x000] __0 : 60 [Type: __int64]
|
||||
|
||||
// cdb-command: dx w_u8
|
||||
// cdb-check:w_u8 : 0x46 [Type: core::num::wrapping::Wrapping<u8>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u8>]
|
||||
// cdb-check: [+0x000] __0 : 0x46 [Type: unsigned char]
|
||||
|
||||
// cdb-command: dx w_u16
|
||||
// cdb-check:w_u16 : 0x50 [Type: core::num::wrapping::Wrapping<u16>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u16>]
|
||||
// cdb-check: [+0x000] __0 : 0x50 [Type: unsigned short]
|
||||
|
||||
// cdb-command: dx w_u32
|
||||
// cdb-check:w_u32 : 0x5a [Type: core::num::wrapping::Wrapping<u32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u32>]
|
||||
// cdb-check: [+0x000] __0 : 0x5a [Type: unsigned int]
|
||||
|
||||
// cdb-command: dx w_u64
|
||||
// cdb-check:w_u64 : 0x64 [Type: core::num::wrapping::Wrapping<u64>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u64>]
|
||||
// cdb-check: [+0x000] __0 : 0x64 [Type: unsigned __int64]
|
||||
|
||||
// 128-bit integers don't seem to work in CDB
|
||||
// cdb-command: dx w_u128
|
||||
// cdb-check:w_u128 [Type: core::num::wrapping::Wrapping<u128>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u128>]
|
||||
// cdb-check:w_u128 : 110 [Type: core::num::wrapping::Wrapping<u128>]
|
||||
// cdb-check: [+0x000] __0 : 110 [Type: u128]
|
||||
|
||||
// cdb-command: dx w_usize
|
||||
// cdb-check:w_usize : 0x78 [Type: core::num::wrapping::Wrapping<usize>]
|
||||
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<usize>]
|
||||
// cdb-check: [+0x000] __0 : 0x78 [Type: unsigned __int64]
|
||||
|
||||
// cdb-command: dx a_bool_t
|
||||
// cdb-check:a_bool_t : true [Type: core::sync::atomic::AtomicBool]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicBool]
|
||||
// cdb-check: [+0x000] v : 0x1 [Type: core::cell::UnsafeCell<u8>]
|
||||
|
||||
// cdb-command: dx a_bool_f
|
||||
// cdb-check:a_bool_f : false [Type: core::sync::atomic::AtomicBool]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicBool]
|
||||
// cdb-check: [+0x000] v : 0x0 [Type: core::cell::UnsafeCell<u8>]
|
||||
|
||||
// cdb-command: dx a_i8
|
||||
// cdb-check:a_i8 : 2 [Type: core::sync::atomic::AtomicI8]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI8]
|
||||
// cdb-check: [+0x000] v : 2 [Type: core::cell::UnsafeCell<i8>]
|
||||
|
||||
// cdb-command: dx a_i16
|
||||
// cdb-check:a_i16 : 4 [Type: core::sync::atomic::AtomicI16]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI16]
|
||||
// cdb-check: [+0x000] v : 4 [Type: core::cell::UnsafeCell<i16>]
|
||||
|
||||
// cdb-command: dx a_i32
|
||||
// cdb-check:a_i32 : 8 [Type: core::sync::atomic::AtomicI32]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI32]
|
||||
// cdb-check: [+0x000] v : 8 [Type: core::cell::UnsafeCell<i32>]
|
||||
|
||||
// cdb-command: dx a_i64
|
||||
// cdb-check:a_i64 : 16 [Type: core::sync::atomic::AtomicI64]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI64]
|
||||
// cdb-check: [+0x000] v : 16 [Type: core::cell::UnsafeCell<i64>]
|
||||
|
||||
// cdb-command: dx a_isize
|
||||
// cdb-check:a_isize : 32 [Type: core::sync::atomic::AtomicIsize]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicIsize]
|
||||
// cdb-check: [+0x000] v : 32 [Type: core::cell::UnsafeCell<isize>]
|
||||
|
||||
// cdb-command: dx a_u8
|
||||
// cdb-check:a_u8 : 0x40 [Type: core::sync::atomic::AtomicU8]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU8]
|
||||
// cdb-check: [+0x000] v : 0x40 [Type: core::cell::UnsafeCell<u8>]
|
||||
|
||||
// cdb-command: dx a_u16
|
||||
// cdb-check:a_u16 : 0x80 [Type: core::sync::atomic::AtomicU16]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU16]
|
||||
// cdb-check: [+0x000] v : 0x80 [Type: core::cell::UnsafeCell<u16>]
|
||||
|
||||
// cdb-command: dx a_u32
|
||||
// cdb-check:a_u32 : 0x100 [Type: core::sync::atomic::AtomicU32]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU32]
|
||||
// cdb-check: [+0x000] v : 0x100 [Type: core::cell::UnsafeCell<u32>]
|
||||
|
||||
// cdb-command: dx a_u64
|
||||
// cdb-check:a_u64 : 0x200 [Type: core::sync::atomic::AtomicU64]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU64]
|
||||
// cdb-check: [+0x000] v : 0x200 [Type: core::cell::UnsafeCell<u64>]
|
||||
|
||||
// cdb-command: dx a_usize
|
||||
// cdb-check:a_usize : 0x400 [Type: core::sync::atomic::AtomicUsize]
|
||||
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicUsize]
|
||||
// cdb-check: [+0x000] v : 0x400 [Type: core::cell::UnsafeCell<usize>]
|
||||
|
||||
|
||||
// === GDB TESTS ===================================================================================
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
// Testing the display of range types in cdb.
|
||||
|
||||
// cdb-only
|
||||
//@ min-cdb-version: 10.0.18317.1001
|
||||
//@ only-cdb
|
||||
|
||||
// FIXME(jieyouxu): triple check in CI if the directive actually works
|
||||
//@ min-cdb-version: 10.0.26100.2161
|
||||
|
||||
//@ compile-flags:-g
|
||||
|
||||
// === CDB TESTS ==================================================================================
|
||||
@ -10,23 +13,26 @@
|
||||
|
||||
// cdb-command: dx r1,d
|
||||
// cdb-check:r1,d : (3..5) [Type: core::ops::range::Range<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::ops::range::Range<i32>]
|
||||
// cdb-check: [+0x000] start : 3 [Type: int]
|
||||
// cdb-check: [+0x004] end : 5 [Type: int]
|
||||
|
||||
// cdb-command: dx r2,d
|
||||
// cdb-check:r2,d : (2..) [Type: core::ops::range::RangeFrom<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::ops::range::RangeFrom<i32>]
|
||||
// cdb-check: [+0x000] start : 2 [Type: int]
|
||||
|
||||
// cdb-command: dx r3,d
|
||||
// cdb-check:r3,d : (1..=4) [Type: core::ops::range::RangeInclusive<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::ops::range::RangeInclusive<i32>]
|
||||
// cdb-check: [+0x000] start : 1 [Type: int]
|
||||
// cdb-check: [+0x004] end : 4 [Type: int]
|
||||
// cdb-check: [+0x008] exhausted : false [Type: bool]
|
||||
|
||||
// cdb-command: dx r4,d
|
||||
// cdb-check:r4,d : (..10) [Type: core::ops::range::RangeTo<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::ops::range::RangeTo<i32>]
|
||||
// cdb-check: [+0x000] end : 10 [Type: int]
|
||||
|
||||
// cdb-command: dx r5,d
|
||||
// cdb-check:r5,d : (..=3) [Type: core::ops::range::RangeToInclusive<i32>]
|
||||
// cdb-check: [<Raw View>] [Type: core::ops::range::RangeToInclusive<i32>]
|
||||
// cdb-check: [+0x000] end : 3 [Type: int]
|
||||
|
||||
// cdb-command: dx r6,d
|
||||
// cdb-check:r6,d [Type: core::ops::range::RangeFull]
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
//@ compile-flags:-g
|
||||
|
||||
// FIXME(jieyouxu): triple check if this works in CI
|
||||
//@ min-cdb-version: 10.0.26100.2161
|
||||
|
||||
// === GDB TESTS ===================================================================================
|
||||
|
||||
// gdb-command: run
|
||||
@ -26,18 +29,18 @@
|
||||
// cdb-check: Breakpoint 0 hit
|
||||
|
||||
// cdb-command: dx _ref
|
||||
// cdb-check: _ref : 0x[...] : () [Type: tuple$<> *]
|
||||
// cdb-check: _ref : 0x[...] [Type: tuple$<> *]
|
||||
|
||||
// cdb-command: dx _ptr
|
||||
// cdb-check: _ptr : 0x[...] : () [Type: tuple$<> *]
|
||||
// cdb-check: _ptr : 0x[...] [Type: tuple$<> *]
|
||||
|
||||
// cdb-command: dx _local
|
||||
// cdb-check: _local : () [Type: tuple$<>]
|
||||
// cdb-check: _local [Type: tuple$<>]
|
||||
|
||||
// cdb-command: dx _field,d
|
||||
// cdb-check: _field,d [Type: unit_type::_TypeContainingUnitField]
|
||||
// cdb-check: [+0x[...]] _a : 123 [Type: unsigned int]
|
||||
// cdb-check: [+0x[...]] _unit : () [Type: tuple$<>]
|
||||
// cdb-check: [+0x[...]] _unit [Type: tuple$<>]
|
||||
// cdb-check: [+0x[...]] _b : 456 [Type: unsigned __int64]
|
||||
|
||||
// Check that we can cast "void pointers" to their actual type in the debugger
|
||||
|
||||
Loading…
Reference in New Issue
Block a user