authorgravatar for alex_naskos@hotmail.comAlexandros Naskos <alex_naskos@hotmail.com> 2020-06-24 21:04:31+03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-06-24 23:58:02-04:00
log2fde8249b72f22ddfa16793c245315f30c7f3ff8
tree1b5eddc4444c3c1cc09df2c01963cc3cd02d344c
parentd337469e4484ffd160b4508e2366fefd435f6c8a

Fixed crash when resolving peer types of *[N:s]const T and [*:s]const T

3 files changed, 8 insertions(+), 0 deletions(-)

src/ir.cpp+1
......@@ -12603,6 +12603,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
1260312603 prev_type->data.pointer.child_type->id == ZigTypeIdArray &&
1260412604 ((cur_type->id == ZigTypeIdPointer && cur_type->data.pointer.ptr_len == PtrLenUnknown)))
1260512605 {
12606 convert_to_const_slice = false;
1260612607 prev_inst = cur_inst;
1260712608
1260812609 if (prev_type->data.pointer.is_const && !cur_type->data.pointer.is_const) {
test/stage1/behavior.zig+1
......@@ -50,6 +50,7 @@ comptime {
5050 _ = @import("behavior/bugs/4769_b.zig");
5151 _ = @import("behavior/bugs/4769_c.zig");
5252 _ = @import("behavior/bugs/4954.zig");
53 _ = @import("behavior/bugs/5413.zig");
5354 _ = @import("behavior/bugs/5474.zig");
5455 _ = @import("behavior/bugs/5487.zig");
5556 _ = @import("behavior/bugs/394.zig");
test/stage1/behavior/bugs/5413.zig created+6
......@@ -0,0 +1,6 @@
1const expect = @import("std").testing.expect;
2
3test "Peer type resolution with string literals and unknown length u8 pointers" {
4 expect(@TypeOf("", "a", @as([*:0]const u8, "")) == [*:0]const u8);
5 expect(@TypeOf(@as([*:0]const u8, "baz"), "foo", "bar") == [*:0]const u8);
6}