mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ir: Fix sizeOf comparison with ptr to zst"

Browse Source 
This reverts commit 89812217b4e5fee7e2851266c17c9d47204a1573.

This caused #4560
This commit is contained in:
Andrew Kelley 2020-02-25 21:23:35 -05:00
parent e9bac8be6b
commit dad62a7e27
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/analyze.cpp
View File

@ -1132,9 +1132,10 @@ Error type_val_resolve_zero_bits(CodeGen *g, ZigValue *type_val, ZigType *parent
if (type_val->special != ConstValSpecialLazy) {
assert(type_val->special == ConstValSpecialStatic);
if ((type_val->data.x_type->id == ZigTypeIdStruct &&
type_val->data.x_type->data.structure.resolve_loop_flag_zero_bits) ||
type_val->data.x_type->data.structure.resolve_loop_flag_zero_bits) ||
(type_val->data.x_type->id == ZigTypeIdUnion &&
type_val->data.x_type->data.unionation.resolve_loop_flag_zero_bits))
type_val->data.x_type->data.unionation.resolve_loop_flag_zero_bits) ||
type_val->data.x_type->id == ZigTypeIdPointer)
{
// Does a struct/union which contains a pointer field to itself have bits? Yes.
*is_zero_bits = false;

34
test/stage1/behavior/sizeof_and_typeof.zig
View File

@ -1,7 +1,5 @@
const std = @import("std");
const builtin = std.builtin;
const expect = std.testing.expect;
const expectEqual = std.testing.expectEqual;
const builtin = @import("builtin");
const expect = @import("std").testing.expect;
test "@sizeOf and @TypeOf" {
const y: @TypeOf(x) = 120;
@ -137,31 +135,3 @@ test "@bitSizeOf" {
a: u2
}) == 2);
}
test "@sizeOf comparison against zero" {
const S0 = struct {
f: *@This(),
};
const U0 = union {
f: *@This(),
};
const S = struct {
fn doTheTest(comptime T: type, comptime result: bool) void {
expectEqual(result, @sizeOf(T) > 0);
}
};
// Zero-sized type
S.doTheTest(u0, false);
S.doTheTest(*u0, false);
// Non byte-sized type
S.doTheTest(u1, true);
S.doTheTest(*u1, true);
// Regular type
S.doTheTest(u8, true);
S.doTheTest(*u8, true);
S.doTheTest(f32, true);
S.doTheTest(*f32, true);
// Container with ptr pointing to themselves
S.doTheTest(S0, true);
S.doTheTest(U0, true);
}