authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-26 15:27:41-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-26 15:27:41-04:00
log11ca38a4e9c637bf6ff635f4f62634edaf89f853
treed5cce0cbb97bd4c7756b591066d5f10152aa8bb1
parentaf95e1557214df4a1a34a712efc2f8dafb502c82

fix crash for optional pointer to empty struct

closes #1153

3 files changed, 12 insertions(+), 1 deletions(-)

src/ir.cpp+2-1
......@@ -7985,9 +7985,10 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry
79857985
79867986 // * and [*] can do a const-cast-only to ?* and ?[*], respectively
79877987 // but not if there is a mutable parent pointer
7988 // and not if the pointer is zero bits
79887989 if (!wanted_is_mutable && wanted_type->id == TypeTableEntryIdOptional &&
79897990 wanted_type->data.maybe.child_type->id == TypeTableEntryIdPointer &&
7990 actual_type->id == TypeTableEntryIdPointer)
7991 actual_type->id == TypeTableEntryIdPointer && type_has_bits(actual_type))
79917992 {
79927993 ConstCastOnly child = types_match_const_cast_only(ira,
79937994 wanted_type->data.maybe.child_type, actual_type, source_node, wanted_is_mutable);
test/behavior.zig+1
......@@ -35,6 +35,7 @@ comptime {
3535 _ = @import("cases/math.zig");
3636 _ = @import("cases/merge_error_sets.zig");
3737 _ = @import("cases/misc.zig");
38 _ = @import("cases/optional.zig");
3839 _ = @import("cases/namespace_depends_on_compile_var/index.zig");
3940 _ = @import("cases/new_stack_call.zig");
4041 _ = @import("cases/null.zig");
test/cases/optional.zig created+9
......@@ -0,0 +1,9 @@
1const assert = @import("std").debug.assert;
2
3pub const EmptyStruct = struct {};
4
5test "optional pointer to size zero struct" {
6 var e = EmptyStruct{};
7 var o: ?*EmptyStruct = &e;
8 assert(o != null);
9}