Commit ae1ebe09b7c1258bfa8de37244fd9b510b1447a4 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-02-01 14:06:51-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-02-01 14:06:51-05:00
log	ae1ebe09b7c1258bfa8de37244fd9b510b1447a4
tree	aa02aa86d4d916f55b7666f379df78c72fb13cea
parent	bbe857be96084bae6ca1e5f10e35f3631df50edc
signature	Commit is signed but in an unrecognized format.

add compile errror for @bitCast when bit counts mismatch

fixes invalid LLVM IR from previous commit

3 files changed, 46 insertions(+), 23 deletions(-)

src
- ir.cpp
std
- io.zig
test
- compile_errors.zig

src/ir.cpp+12-2

 @@ -20580,10 +20580,10 @@ static IrInstruction *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruct
     if (type_is_invalid(src_type))
         return ira->codegen->invalid_instruction;
-    if ((err = ensure_complete_type(ira->codegen, dest_type)))
+    if ((err = type_resolve(ira->codegen, dest_type, ResolveStatusSizeKnown)))
         return ira->codegen->invalid_instruction;
-    if ((err = ensure_complete_type(ira->codegen, src_type)))
+    if ((err = type_resolve(ira->codegen, src_type, ResolveStatusSizeKnown)))
         return ira->codegen->invalid_instruction;
     if (get_codegen_ptr_type(src_type) != nullptr) {
 @@ -20646,6 +20646,16 @@ static IrInstruction *ir_analyze_instruction_bit_cast(IrAnalyze *ira, IrInstruct
         return ira->codegen->invalid_instruction;
     }
+    uint64_t dest_size_bits = type_size_bits(ira->codegen, dest_type);
+    uint64_t src_size_bits = type_size_bits(ira->codegen, src_type);
+    if (dest_size_bits != src_size_bits) {
+        ir_add_error(ira, &instruction->base,
+            buf_sprintf("destination type '%s' has %" ZIG_PRI_u64 " bits but source type '%s' has %" ZIG_PRI_u64 " bits",
+                buf_ptr(&dest_type->name), dest_size_bits,
+                buf_ptr(&src_type->name), src_size_bits));
+        return ira->codegen->invalid_instruction;
+    }
     if (instr_is_comptime(value)) {
         ConstExprValue *val = ir_resolve_const(ira, value, UndefBad);
         if (!val)

std/io.zig+25-21

 @@ -503,13 +503,13 @@ pub fn BitInStream(endian: builtin.Endian, comptime Error: type) type {
         ///  containing them in the least significant end. The number of bits successfully
         ///  read is placed in `out_bits`, as reaching the end of the stream is not an error.
         pub fn readBits(self: *Self, comptime U: type, bits: usize, out_bits: *usize) Error!U {
-            debug.assert(trait.isUnsignedInt(U));
+            comptime assert(trait.isUnsignedInt(U));
             //by extending the buffer to a minimum of u8 we can cover a number of edge cases
             // related to shifting and casting.
             const u_bit_count = comptime meta.bitCount(U);
             const buf_bit_count = bc: {
-                debug.assert(u_bit_count >= bits);
+                assert(u_bit_count >= bits);
                 break :bc if (u_bit_count <= u8_bit_count) u8_bit_count else u_bit_count;
             };
             const Buf = @IntType(false, buf_bit_count);
 @@ -664,7 +664,7 @@ test "io.SliceOutStream" {
     const stream = &slice_stream.stream;
     try stream.print("{}{}!", "Hello", "World");
-    debug.assert(mem.eql(u8, "HelloWorld!", slice_stream.getWritten()));
+    debug.assertOrPanic(mem.eql(u8, "HelloWorld!", slice_stream.getWritten()));
 }
 var null_out_stream_state = NullOutStream.init();
 @@ -726,7 +726,7 @@ test "io.CountingOutStream" {
     const bytes = "yay" ** 10000;
     stream.write(bytes) catch unreachable;
-    debug.assert(counting_stream.bytes_written == bytes.len);
+    debug.assertOrPanic(counting_stream.bytes_written == bytes.len);
 }
 pub fn BufferedOutStream(comptime Error: type) type {
 @@ -835,13 +835,13 @@ pub fn BitOutStream(endian: builtin.Endian, comptime Error: type) type {
             if (bits == 0) return;
             const U = @typeOf(value);
-            debug.assert(trait.isUnsignedInt(U));
+            comptime assert(trait.isUnsignedInt(U));
             //by extending the buffer to a minimum of u8 we can cover a number of edge cases
             // related to shifting and casting.
             const u_bit_count = comptime meta.bitCount(U);
             const buf_bit_count = bc: {
-                debug.assert(u_bit_count >= bits);
+                assert(u_bit_count >= bits);
                 break :bc if (u_bit_count <= u8_bit_count) u8_bit_count else u_bit_count;
             };
             const Buf = @IntType(false, buf_bit_count);
 @@ -1013,10 +1013,10 @@ test "io.readLineFrom" {
     );
     const stream = &mem_stream.stream;
-    debug.assert(mem.eql(u8, "Line 1", try readLineFrom(stream, &buf)));
+    debug.assertOrPanic(mem.eql(u8, "Line 1", try readLineFrom(stream, &buf)));
-    debug.assert(mem.eql(u8, "Line 22", try readLineFrom(stream, &buf)));
+    debug.assertOrPanic(mem.eql(u8, "Line 22", try readLineFrom(stream, &buf)));
     debug.assertError(readLineFrom(stream, &buf), error.EndOfStream);
-    debug.assert(mem.eql(u8, buf.toSlice(), "Line 1Line 22Line 333"));
+    debug.assertOrPanic(mem.eql(u8, buf.toSlice(), "Line 1Line 22Line 333"));
 }
 pub fn readLineSlice(slice: []u8) ![]u8 {
 @@ -1044,7 +1044,7 @@ test "io.readLineSliceFrom" {
     );
     const stream = &mem_stream.stream;
-    debug.assert(mem.eql(u8, "Line 1", try readLineSliceFrom(stream, buf[0..])));
+    debug.assertOrPanic(mem.eql(u8, "Line 1", try readLineSliceFrom(stream, buf[0..])));
     debug.assertError(readLineSliceFrom(stream, buf[0..]), error.OutOfMemory);
 }
 @@ -1057,7 +1057,7 @@ test "io.readLineSliceFrom" {
 ///  which will be called when the deserializer is used to deserialize
 ///  that type. It will pass a pointer to the type instance to deserialize
 ///  into and a pointer to the deserializer struct.
-pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: type) type {
+pub fn Deserializer(comptime endian: builtin.Endian, is_packed: bool, comptime Error: type) type {
     return struct {
         const Self = @This();
 @@ -1079,9 +1079,9 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
         //@BUG: inferred error issue. See: #1386
         fn deserializeInt(self: *Self, comptime T: type) (Stream.Error || error{EndOfStream})!T {
-            debug.assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));
+            comptime assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));
-            const u8_bit_count = comptime meta.bitCount(u8);
+            const u8_bit_count = 8;
             const t_bit_count = comptime meta.bitCount(T);
             const U = @IntType(false, t_bit_count);
 @@ -1097,13 +1097,17 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
             const read_size = try self.in_stream.read(buffer[0..]);
             if (read_size < int_size) return error.EndOfStream;
-            if (int_size == 1) return @bitCast(T, buffer[0]);
+            if (int_size == 1) {
+                if (t_bit_count == 8) return @bitCast(T, buffer[0]);
+                const PossiblySignedByte = @IntType(T.is_signed, 8);
+                return @truncate(T, @bitCast(PossiblySignedByte, buffer[0]));
+            }
             var result = U(0);
             for (buffer) |byte, i| {
                 switch (endian) {
                     builtin.Endian.Big => {
-                        result = (result << @intCast(u4, u8_bit_count)) | byte;
+                        result = (result << u8_bit_count) | byte;
                     },
                     builtin.Endian.Little => {
                         result |= U(byte) << @intCast(Log2U, u8_bit_count * i);
 @@ -1118,12 +1122,12 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
         // see: #1315
         fn setTag(ptr: var, tag: var) void {
             const T = @typeOf(ptr);
-            comptime debug.assert(trait.isPtrTo(builtin.TypeId.Union)(T));
+            comptime assert(trait.isPtrTo(builtin.TypeId.Union)(T));
             const U = meta.Child(T);
             const info = @typeInfo(U).Union;
             if (info.tag_type) |TagType| {
-                debug.assert(TagType == @typeOf(tag));
+                comptime assert(TagType == @typeOf(tag));
                 var ptr_tag = ptr: {
                     if (@alignOf(TagType) >= @alignOf(U)) break :ptr @ptrCast(*TagType, ptr);
 @@ -1151,7 +1155,7 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
         /// Deserializes data into the type pointed to by `ptr`
         pub fn deserializeInto(self: *Self, ptr: var) !void {
             const T = @typeOf(ptr);
-            debug.assert(trait.is(builtin.TypeId.Pointer)(T));
+            comptime assert(trait.is(builtin.TypeId.Pointer)(T));
             if (comptime trait.isSlice(T) or comptime trait.isPtrTo(builtin.TypeId.Array)(T)) {
                 for (ptr) |*v|
 @@ -1159,7 +1163,7 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
                 return;
             }
-            comptime debug.assert(trait.isSingleItemPtr(T));
+            comptime assert(trait.isSingleItemPtr(T));
             const C = comptime meta.Child(T);
             const child_type_id = @typeId(C);
 @@ -1266,7 +1270,7 @@ pub fn Deserializer(endian: builtin.Endian, is_packed: bool, comptime Error: typ
 ///  which will be called when the serializer is used to serialize that type. It will
 ///  pass a const pointer to the type instance to be serialized and a pointer
 ///  to the serializer struct.
-pub fn Serializer(endian: builtin.Endian, is_packed: bool, comptime Error: type) type {
+pub fn Serializer(comptime endian: builtin.Endian, comptime is_packed: bool, comptime Error: type) type {
     return struct {
         const Self = @This();
 @@ -1288,7 +1292,7 @@ pub fn Serializer(endian: builtin.Endian, is_packed: bool, comptime Error: type)
         fn serializeInt(self: *Self, value: var) !void {
             const T = @typeOf(value);
-            debug.assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));
+            comptime assert(trait.is(builtin.TypeId.Int)(T) or trait.is(builtin.TypeId.Float)(T));
             const t_bit_count = comptime meta.bitCount(T);
             const u8_bit_count = comptime meta.bitCount(u8);

test/compile_errors.zig+9

...	@@ -1,6 +1,15 @@	...	@@ -1,6 +1,15 @@
1	const tests = @import("tests.zig");	1	const tests = @import("tests.zig");
2		2
3	pub fn addCases(cases: *tests.CompileErrorContext) void {	3	pub fn addCases(cases: *tests.CompileErrorContext) void {
		4	cases.add(
		5	"@bitCast same size but bit count mismatch",
		6	\\export fn entry(byte: u8) void {
		7	\\ var oops = @bitCast(u7, byte);
		8	\\}
		9	,
		10	".tmp_source.zig:2:16: error: destination type 'u7' has 7 bits but source type 'u8' has 8 bits",
		11	);
		12
4	cases.add(	13	cases.add(
5	"attempted `&&`",	14	"attempted `&&`",
6	\\export fn entry(a: bool, b: bool) i32 {	15	\\export fn entry(a: bool, b: bool) i32 {