authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-22 13:10:44-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-08-22 20:08:04-04:00
log4a132d4bce75aa9d81b5af0e8c2180ce1e0a3c60
tree37cb894b2473acb838f8102b7d99282a0d13913b
parentcbaff43b2a3697a168fcf9d5c022f2193d1fc9a0

Type: fix inconsistency between `zig fmt` and `@typeName`

4 files changed, 21 insertions(+), 21 deletions(-)

ci/x86_64-linux-debug.sh+1-1
......@@ -64,7 +64,7 @@ stage3-debug/bin/zig build \
6464
6565stage3-debug/bin/zig build test docs \
6666 --maxrss 21000000000 \
67 -Dlldb=$HOME/deps/lldb-zig/Debug-f96d3e6fc/bin/lldb \
67 -Dlldb=$HOME/deps/lldb-zig/Debug-62538077d/bin/lldb \
6868 -fqemu \
6969 -fwasmtime \
7070 -Dstatic-llvm \
ci/x86_64-linux-release.sh+1-1
......@@ -64,7 +64,7 @@ stage3-release/bin/zig build \
6464
6565stage3-release/bin/zig build test docs \
6666 --maxrss 21000000000 \
67 -Dlldb=$HOME/deps/lldb-zig/Release-f96d3e6fc/bin/lldb \
67 -Dlldb=$HOME/deps/lldb-zig/Release-62538077d/bin/lldb \
6868 -fqemu \
6969 -fwasmtime \
7070 -Dstatic-llvm \
src/Type.zig+1-1
......@@ -202,6 +202,7 @@ pub fn print(ty: Type, writer: anytype, pt: Zcu.PerThread) @TypeOf(writer).Error
202202 .C => try writer.writeAll("[*c]"),
203203 .Slice => try writer.writeAll("[]"),
204204 }
205 if (info.flags.is_allowzero and info.flags.size != .C) try writer.writeAll("allowzero ");
205206 if (info.flags.alignment != .none or
206207 info.packed_offset.host_size != 0 or
207208 info.flags.vector_index != .none)
......@@ -229,7 +230,6 @@ pub fn print(ty: Type, writer: anytype, pt: Zcu.PerThread) @TypeOf(writer).Error
229230 }
230231 if (info.flags.is_const) try writer.writeAll("const ");
231232 if (info.flags.is_volatile) try writer.writeAll("volatile ");
232 if (info.flags.is_allowzero and info.flags.size != .C) try writer.writeAll("allowzero ");
233233
234234 try print(Type.fromInterned(info.child), writer, pt);
235235 return;
test/src/Debugger.zig+18-18
......@@ -205,26 +205,26 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
205205 \\ single_volatile: *volatile u32 = @ptrFromInt(0x1018),
206206 \\ single_const_volatile: *const volatile u32 = @ptrFromInt(0x101c),
207207 \\ single_allowzero: *allowzero u32 = @ptrFromInt(0x1020),
208 \\ single_const_allowzero: *const allowzero u32 = @ptrFromInt(0x1024),
209 \\ single_volatile_allowzero: *volatile allowzero u32 = @ptrFromInt(0x1028),
210 \\ single_const_volatile_allowzero: *const volatile allowzero u32 = @ptrFromInt(0x102c),
208 \\ single_allowzero_const: *allowzero const u32 = @ptrFromInt(0x1024),
209 \\ single_allowzero_volatile: *allowzero volatile u32 = @ptrFromInt(0x1028),
210 \\ single_allowzero_const_volatile: *allowzero const volatile u32 = @ptrFromInt(0x102c),
211211 \\
212212 \\ many: [*]u32 = @ptrFromInt(0x2010),
213213 \\ many_const: [*]const u32 = @ptrFromInt(0x2014),
214214 \\ many_volatile: [*]volatile u32 = @ptrFromInt(0x2018),
215215 \\ many_const_volatile: [*]const volatile u32 = @ptrFromInt(0x201c),
216216 \\ many_allowzero: [*]allowzero u32 = @ptrFromInt(0x2020),
217 \\ many_const_allowzero: [*]const allowzero u32 = @ptrFromInt(0x2024),
218 \\ many_volatile_allowzero: [*]volatile allowzero u32 = @ptrFromInt(0x2028),
219 \\ many_const_volatile_allowzero: [*]const volatile allowzero u32 = @ptrFromInt(0x202c),
217 \\ many_allowzero_const: [*]allowzero const u32 = @ptrFromInt(0x2024),
218 \\ many_allowzero_volatile: [*]allowzero volatile u32 = @ptrFromInt(0x2028),
219 \\ many_allowzero_const_volatile: [*]allowzero const volatile u32 = @ptrFromInt(0x202c),
220220 \\ slice: []u32 = array[0..1],
221221 \\ slice_const: []const u32 = array[0..2],
222222 \\ slice_volatile: []volatile u32 = array[0..3],
223223 \\ slice_const_volatile: []const volatile u32 = array[0..4],
224224 \\ slice_allowzero: []allowzero u32 = array[4..4],
225 \\ slice_const_allowzero: []const allowzero u32 = array[4..5],
226 \\ slice_volatile_allowzero: []volatile allowzero u32 = array[4..6],
227 \\ slice_const_volatile_allowzero: []const volatile allowzero u32 = array[4..7],
225 \\ slice_allowzero_const: []allowzero const u32 = array[4..5],
226 \\ slice_allowzero_volatile: []allowzero volatile u32 = array[4..6],
227 \\ slice_allowzero_const_volatile: []allowzero const volatile u32 = array[4..7],
228228 \\
229229 \\ c: [*c]u32 = @ptrFromInt(0x4010),
230230 \\ c_const: [*c]const u32 = @ptrFromInt(0x4014),
......@@ -254,17 +254,17 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
254254 \\ (*volatile u32) single_volatile = 0x0000000000001018
255255 \\ (*const volatile u32) single_const_volatile = 0x000000000000101c
256256 \\ (*allowzero u32) single_allowzero = 0x0000000000001020
257 \\ (*const allowzero u32) single_const_allowzero = 0x0000000000001024
258 \\ (*volatile allowzero u32) single_volatile_allowzero = 0x0000000000001028
259 \\ (*const volatile allowzero u32) single_const_volatile_allowzero = 0x000000000000102c
257 \\ (*allowzero const u32) single_allowzero_const = 0x0000000000001024
258 \\ (*allowzero volatile u32) single_allowzero_volatile = 0x0000000000001028
259 \\ (*allowzero const volatile u32) single_allowzero_const_volatile = 0x000000000000102c
260260 \\ ([*]u32) many = 0x0000000000002010
261261 \\ ([*]const u32) many_const = 0x0000000000002014
262262 \\ ([*]volatile u32) many_volatile = 0x0000000000002018
263263 \\ ([*]const volatile u32) many_const_volatile = 0x000000000000201c
264264 \\ ([*]allowzero u32) many_allowzero = 0x0000000000002020
265 \\ ([*]const allowzero u32) many_const_allowzero = 0x0000000000002024
266 \\ ([*]volatile allowzero u32) many_volatile_allowzero = 0x0000000000002028
267 \\ ([*]const volatile allowzero u32) many_const_volatile_allowzero = 0x000000000000202c
265 \\ ([*]allowzero const u32) many_allowzero_const = 0x0000000000002024
266 \\ ([*]allowzero volatile u32) many_allowzero_volatile = 0x0000000000002028
267 \\ ([*]allowzero const volatile u32) many_allowzero_const_volatile = 0x000000000000202c
268268 \\ ([]u32) slice = len=1 {
269269 \\ (u32) [0] = 3010
270270 \\ }
......@@ -284,14 +284,14 @@ pub fn addTestsForTarget(db: *Debugger, target: Target) void {
284284 \\ (u32) [3] = 3022
285285 \\ }
286286 \\ ([]allowzero u32) slice_allowzero = len=0 {}
287 \\ ([]const allowzero u32) slice_const_allowzero = len=1 {
287 \\ ([]allowzero const u32) slice_allowzero_const = len=1 {
288288 \\ (u32) [0] = 3026
289289 \\ }
290 \\ ([]volatile allowzero u32) slice_volatile_allowzero = len=2 {
290 \\ ([]allowzero volatile u32) slice_allowzero_volatile = len=2 {
291291 \\ (u32) [0] = 3026
292292 \\ (u32) [1] = 3030
293293 \\ }
294 \\ ([]const volatile allowzero u32) slice_const_volatile_allowzero = len=3 {
294 \\ ([]allowzero const volatile u32) slice_allowzero_const_volatile = len=3 {
295295 \\ (u32) [0] = 3026
296296 \\ (u32) [1] = 3030
297297 \\ (u32) [2] = 3034