Skip to content

Commit 1503279

Browse files
committed
Update cdb annotations for numeric-types with cdb 10.0.26100.2161
1 parent 46e8d20 commit 1503279

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

tests/debuginfo/numeric-types.rs

+32-29
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
//@ ignore-windows-gnu: #128981
44

5+
// Note: u128 visualization was not supported in 10.0.22621.3233 but was fixed in 10.0.26100.2161.
6+
// FIXME(jieyouxu): triple-check if this annotation works properly in CI, because it seems to
7+
// ignore the test locally for me.
8+
//@ min-cdb-version: 10.0.26100.2161
9+
510
// Tests the visualizations for `NonZero<T>`, `Wrapping<T>` and
611
// `Atomic{Bool,I8,I16,I32,I64,Isize,U8,U16,U32,U64,Usize}` located in `libcore.natvis`.
712

@@ -48,8 +53,8 @@
4853
// cdb-check:nz_u64 : 0x64 [Type: core::num::nonzero::NonZero<u64>]
4954
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u64>]
5055

51-
// 128-bit integers don't seem to work in CDB
5256
// cdb-command: dx nz_u128
57+
// cdb-check:nz_u128 : 111 [Type: core::num::nonzero::NonZero<u128>]
5358
// cdb-check: [<Raw View>] [Type: core::num::nonzero::NonZero<u128>]
5459

5560
// cdb-command: dx nz_usize
@@ -58,101 +63,99 @@
5863

5964
// cdb-command: dx w_i8
6065
// cdb-check:w_i8 : 10 [Type: core::num::wrapping::Wrapping<i8>]
61-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i8>]
66+
// cdb-check: [+0x000] __0 : 10 [Type: char]
6267

6368
// cdb-command: dx w_i16
6469
// cdb-check:w_i16 : 20 [Type: core::num::wrapping::Wrapping<i16>]
65-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i16>]
70+
// cdb-check: [+0x000] __0 : 20 [Type: short]
6671

6772
// cdb-command: dx w_i32
6873
// cdb-check:w_i32 : 30 [Type: core::num::wrapping::Wrapping<i32>]
69-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i32>]
74+
// cdb-check: [+0x000] __0 : 30 [Type: int]
7075

7176
// cdb-command: dx w_i64
7277
// cdb-check:w_i64 : 40 [Type: core::num::wrapping::Wrapping<i64>]
73-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i64>]
78+
// cdb-check: [+0x000] __0 : 40 [Type: __int64]
7479

75-
// 128-bit integers don't seem to work in CDB
7680
// cdb-command: dx w_i128
77-
// cdb-check:w_i128 [Type: core::num::wrapping::Wrapping<i128>]
78-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<i128>]
81+
// cdb-check:w_i128 : 50 [Type: core::num::wrapping::Wrapping<i128>]
82+
// cdb-check: [+0x000] __0 : 50 [Type: i128]
7983

8084
// cdb-command: dx w_isize
8185
// cdb-check:w_isize : 60 [Type: core::num::wrapping::Wrapping<isize>]
82-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<isize>]
86+
// cdb-check: [+0x000] __0 : 60 [Type: __int64]
8387

8488
// cdb-command: dx w_u8
8589
// cdb-check:w_u8 : 0x46 [Type: core::num::wrapping::Wrapping<u8>]
86-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u8>]
90+
// cdb-check: [+0x000] __0 : 0x46 [Type: unsigned char]
8791

8892
// cdb-command: dx w_u16
8993
// cdb-check:w_u16 : 0x50 [Type: core::num::wrapping::Wrapping<u16>]
90-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u16>]
94+
// cdb-check: [+0x000] __0 : 0x50 [Type: unsigned short]
9195

9296
// cdb-command: dx w_u32
9397
// cdb-check:w_u32 : 0x5a [Type: core::num::wrapping::Wrapping<u32>]
94-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u32>]
98+
// cdb-check: [+0x000] __0 : 0x5a [Type: unsigned int]
9599

96100
// cdb-command: dx w_u64
97101
// cdb-check:w_u64 : 0x64 [Type: core::num::wrapping::Wrapping<u64>]
98-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u64>]
102+
// cdb-check: [+0x000] __0 : 0x64 [Type: unsigned __int64]
99103

100-
// 128-bit integers don't seem to work in CDB
101104
// cdb-command: dx w_u128
102-
// cdb-check:w_u128 [Type: core::num::wrapping::Wrapping<u128>]
103-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<u128>]
105+
// cdb-check:w_u128 : 110 [Type: core::num::wrapping::Wrapping<u128>]
106+
// cdb-check: [+0x000] __0 : 110 [Type: u128]
104107

105108
// cdb-command: dx w_usize
106109
// cdb-check:w_usize : 0x78 [Type: core::num::wrapping::Wrapping<usize>]
107-
// cdb-check: [<Raw View>] [Type: core::num::wrapping::Wrapping<usize>]
110+
// cdb-check: [+0x000] __0 : 0x78 [Type: unsigned __int64]
108111

109112
// cdb-command: dx a_bool_t
110113
// cdb-check:a_bool_t : true [Type: core::sync::atomic::AtomicBool]
111-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicBool]
114+
// cdb-check: [+0x000] v : 0x1 [Type: core::cell::UnsafeCell<u8>]
112115

113116
// cdb-command: dx a_bool_f
114117
// cdb-check:a_bool_f : false [Type: core::sync::atomic::AtomicBool]
115-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicBool]
118+
// cdb-check: [+0x000] v : 0x0 [Type: core::cell::UnsafeCell<u8>]
116119

117120
// cdb-command: dx a_i8
118121
// cdb-check:a_i8 : 2 [Type: core::sync::atomic::AtomicI8]
119-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI8]
122+
// cdb-check: [+0x000] v : 2 [Type: core::cell::UnsafeCell<i8>]
120123

121124
// cdb-command: dx a_i16
122125
// cdb-check:a_i16 : 4 [Type: core::sync::atomic::AtomicI16]
123-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI16]
126+
// cdb-check: [+0x000] v : 4 [Type: core::cell::UnsafeCell<i16>]
124127

125128
// cdb-command: dx a_i32
126129
// cdb-check:a_i32 : 8 [Type: core::sync::atomic::AtomicI32]
127-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI32]
130+
// cdb-check: [+0x000] v : 8 [Type: core::cell::UnsafeCell<i32>]
128131

129132
// cdb-command: dx a_i64
130133
// cdb-check:a_i64 : 16 [Type: core::sync::atomic::AtomicI64]
131-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicI64]
134+
// cdb-check: [+0x000] v : 16 [Type: core::cell::UnsafeCell<i64>]
132135

133136
// cdb-command: dx a_isize
134137
// cdb-check:a_isize : 32 [Type: core::sync::atomic::AtomicIsize]
135-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicIsize]
138+
// cdb-check: [+0x000] v : 32 [Type: core::cell::UnsafeCell<isize>]
136139

137140
// cdb-command: dx a_u8
138141
// cdb-check:a_u8 : 0x40 [Type: core::sync::atomic::AtomicU8]
139-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU8]
142+
// cdb-check: [+0x000] v : 0x40 [Type: core::cell::UnsafeCell<u8>]
140143

141144
// cdb-command: dx a_u16
142145
// cdb-check:a_u16 : 0x80 [Type: core::sync::atomic::AtomicU16]
143-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU16]
146+
// cdb-check: [+0x000] v : 0x80 [Type: core::cell::UnsafeCell<u16>]
144147

145148
// cdb-command: dx a_u32
146149
// cdb-check:a_u32 : 0x100 [Type: core::sync::atomic::AtomicU32]
147-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU32]
150+
// cdb-check: [+0x000] v : 0x100 [Type: core::cell::UnsafeCell<u32>]
148151

149152
// cdb-command: dx a_u64
150153
// cdb-check:a_u64 : 0x200 [Type: core::sync::atomic::AtomicU64]
151-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicU64]
154+
// cdb-check: [+0x000] v : 0x200 [Type: core::cell::UnsafeCell<u64>]
152155

153156
// cdb-command: dx a_usize
154157
// cdb-check:a_usize : 0x400 [Type: core::sync::atomic::AtomicUsize]
155-
// cdb-check: [<Raw View>] [Type: core::sync::atomic::AtomicUsize]
158+
// cdb-check: [+0x000] v : 0x400 [Type: core::cell::UnsafeCell<usize>]
156159

157160

158161
// === GDB TESTS ===================================================================================

0 commit comments

Comments
 (0)