Commit 34a22a85ca

tgschultz <tgschultz@gmail.com>
2019-05-30 20:11:49
altered all instances of readInt* in std.io (and std.debug) to consume the minimum byte size required instead of @sizeOf().
1 parent 05e92a5
Changed files (2)
std/debug.zig
@@ -2224,8 +2224,9 @@ fn findCompileUnit(di: *DwarfInfo, target_address: u64) !*const CompileUnit {
 
 fn readIntMem(ptr: *[*]const u8, comptime T: type, endian: builtin.Endian) T {
     // TODO https://github.com/ziglang/zig/issues/863
-    const result = mem.readIntSlice(T, ptr.*[0..@sizeOf(T)], endian);
-    ptr.* += @sizeOf(T);
+    const size = (T.bit_count + 7) / 8;
+    const result = mem.readIntSlice(T, ptr.*[0..size], endian);
+    ptr.* += size;
     return result;
 }
 
std/io.zig
@@ -164,32 +164,32 @@ pub fn InStream(comptime ReadError: type) type {
 
         /// Reads a native-endian integer
         pub fn readIntNative(self: *Self, comptime T: type) !T {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             try self.readNoEof(bytes[0..]);
             return mem.readIntNative(T, &bytes);
         }
 
         /// Reads a foreign-endian integer
         pub fn readIntForeign(self: *Self, comptime T: type) !T {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             try self.readNoEof(bytes[0..]);
             return mem.readIntForeign(T, &bytes);
         }
 
         pub fn readIntLittle(self: *Self, comptime T: type) !T {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             try self.readNoEof(bytes[0..]);
             return mem.readIntLittle(T, &bytes);
         }
 
         pub fn readIntBig(self: *Self, comptime T: type) !T {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             try self.readNoEof(bytes[0..]);
             return mem.readIntBig(T, &bytes);
         }
 
         pub fn readInt(self: *Self, comptime T: type, endian: builtin.Endian) !T {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             try self.readNoEof(bytes[0..]);
             return mem.readInt(T, &bytes, endian);
         }
@@ -249,32 +249,32 @@ pub fn OutStream(comptime WriteError: type) type {
 
         /// Write a native-endian integer.
         pub fn writeIntNative(self: *Self, comptime T: type, value: T) Error!void {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             mem.writeIntNative(T, &bytes, value);
             return self.writeFn(self, bytes);
         }
 
         /// Write a foreign-endian integer.
         pub fn writeIntForeign(self: *Self, comptime T: type, value: T) Error!void {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             mem.writeIntForeign(T, &bytes, value);
             return self.writeFn(self, bytes);
         }
 
         pub fn writeIntLittle(self: *Self, comptime T: type, value: T) Error!void {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             mem.writeIntLittle(T, &bytes, value);
             return self.writeFn(self, bytes);
         }
 
         pub fn writeIntBig(self: *Self, comptime T: type, value: T) Error!void {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             mem.writeIntBig(T, &bytes, value);
             return self.writeFn(self, bytes);
         }
 
         pub fn writeInt(self: *Self, comptime T: type, value: T, endian: builtin.Endian) Error!void {
-            var bytes: [@sizeOf(T)]u8 = undefined;
+            var bytes: [(T.bit_count + 7 )/ 8]u8 = undefined;
             mem.writeInt(T, &bytes, value, endian);
             return self.writeFn(self, bytes);
         }