Skip to content

Update cdb annotations for some debuginfo tests with cdb 10.0.26100.2161 #133115

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
merged 4 commits into from
Nov 16, 2024
Merged

Update cdb annotations for some debuginfo tests with cdb 10.0.26100.2161 #133115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1503279
Update cdb annotations for `numeric-types` with cdb `10.0.26100.2161`
jieyouxu Nov 16, 2024
94f3dcf
Update cdb annotations for `range-types.rs` with cdb `10.0.26100.2161`
jieyouxu Nov 16, 2024
e70df09
Update cdb annotations for `unit-type.rs` with cdb `10.0.26100.2161`
jieyouxu Nov 16, 2024
dccb6c0
Mark `numeric-types.rs` as 64-bit only for now
jieyouxu Nov 16, 2024
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
64 changes: 35 additions & 29 deletions tests/debuginfo/numeric-types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down Expand Up @@ -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
Expand All @@ -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 ===================================================================================
Expand Down
20 changes: 13 additions & 7 deletions tests/debuginfo/range-types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// Testing the display of range types in cdb.

// cdb-only
//@ min-cdb-version: 10.0.18317.1001
//@ only-cdb
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: // cdb-only had no effect, but this test only contained cdb so this really doesn't change anything.


// FIXME(jieyouxu): triple check in CI if the directive actually works
//@ min-cdb-version: 10.0.26100.2161

//@ compile-flags:-g

// === CDB TESTS ==================================================================================
Expand All @@ -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]
Expand Down
11 changes: 7 additions & 4 deletions tests/debuginfo/unit-type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Loading