From 00afaa4b1822e9d2c096830e546e96ab4e87f25b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 18 Apr 2025 18:23:06 -0700 Subject: std.io.BufferedReader: get rid of the `@constCast` but it's pushed out to various callsites --- lib/std/debug/Dwarf.zig | 2 +- lib/std/debug/Dwarf/expression.zig | 4 ++-- lib/std/debug/FixedBufferReader.zig | 2 +- lib/std/debug/SelfInfo.zig | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/std/debug') diff --git a/lib/std/debug/Dwarf.zig b/lib/std/debug/Dwarf.zig index 422d0e5b2e..4106b7d621 100644 --- a/lib/std/debug/Dwarf.zig +++ b/lib/std/debug/Dwarf.zig @@ -2236,7 +2236,7 @@ pub const ElfModule = struct { const section_bytes = try chopSlice(mapped_mem, shdr.sh_offset, shdr.sh_size); sections[section_index.?] = if ((shdr.sh_flags & elf.SHF_COMPRESSED) > 0) blk: { var section_reader: std.io.BufferedReader = undefined; - section_reader.initFixed(section_bytes); + section_reader.initFixed(@constCast(section_bytes)); const chdr = section_reader.takeStruct(elf.Chdr) catch continue; if (chdr.ch_type != .ZLIB) continue; const ch_size = chdr.ch_size; diff --git a/lib/std/debug/Dwarf/expression.zig b/lib/std/debug/Dwarf/expression.zig index 4f11830d9c..3bdef6f03b 100644 --- a/lib/std/debug/Dwarf/expression.zig +++ b/lib/std/debug/Dwarf/expression.zig @@ -262,7 +262,7 @@ pub fn StackMachine(comptime options: Options) type { ) Error!?Value { if (initial_value) |i| try self.stack.append(allocator, .{ .generic = i }); var reader: std.io.BufferedReader = undefined; - reader.initFixed(expression); + reader.initFixed(@constCast(expression)); while (try self.step(&reader, allocator, context)) {} if (self.stack.items.len == 0) return null; return self.stack.items[self.stack.items.len - 1]; @@ -721,7 +721,7 @@ pub fn StackMachine(comptime options: Options) type { if (context.thread_context == null) return error.IncompleteExpressionContext; var block_reader: std.io.BufferedReader = undefined; - block_reader.initFixed(block); + block_reader.initFixed(@constCast(block)); const register = (try readOperand(&block_reader, block[0], context)).?.register; const value = mem.readInt(usize, (try abi.regBytes(context.thread_context.?, register, context.reg_context))[0..@sizeOf(usize)], native_endian); try self.stack.append(allocator, .{ .generic = value }); diff --git a/lib/std/debug/FixedBufferReader.zig b/lib/std/debug/FixedBufferReader.zig index dc431ad074..035495ca55 100644 --- a/lib/std/debug/FixedBufferReader.zig +++ b/lib/std/debug/FixedBufferReader.zig @@ -53,7 +53,7 @@ pub fn readIntChecked( pub fn readLeb128(fbr: *FixedBufferReader, comptime T: type) Error!T { var br: std.io.BufferedReader = undefined; - br.initFixed(fbr.buf); + br.initFixed(@constCast(fbr.buf)); br.seek = fbr.pos; const result = br.takeLeb128(T); fbr.pos = br.seek; diff --git a/lib/std/debug/SelfInfo.zig b/lib/std/debug/SelfInfo.zig index 3b44ffcd6e..dfc4993297 100644 --- a/lib/std/debug/SelfInfo.zig +++ b/lib/std/debug/SelfInfo.zig @@ -2026,8 +2026,8 @@ pub const VirtualMachine = struct { if (pc < fde.pc_begin or pc >= fde.pc_begin + fde.pc_range) return error.AddressOutOfRange; var readers: [2]std.io.BufferedReader = undefined; - readers[0].initFixed(cie.initial_instructions); - readers[1].initFixed(fde.instructions); + readers[0].initFixed(@constCast(cie.initial_instructions)); + readers[1].initFixed(@constCast(fde.instructions)); var prev_row: Row = self.current_row; for (&readers, [2]bool{ true, false }) |*reader, is_initial| { -- cgit v1.2.3