motiejus/zig

commit 2fde8249b72f22ddfa16793c245315f30c7f3ff8 (tree)
parent d337469e4484ffd160b4508e2366fefd435f6c8a
Author: Alexandros Naskos <alex_naskos@hotmail.com>
Date:   Wed, 24 Jun 2020 21:04:31 +0300

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

Diffstat:
M
src/ir.cpp
 | 
1
+
M
test/stage1/behavior.zig
 | 
1
+
A
test/stage1/behavior/bugs/5413.zig
 | 
6
++++++

3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -12603,6 +12603,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
             prev_type->data.pointer.child_type->id == ZigTypeIdArray &&
             ((cur_type->id == ZigTypeIdPointer && cur_type->data.pointer.ptr_len == PtrLenUnknown)))
         {
+            convert_to_const_slice = false;
             prev_inst = cur_inst;
 
             if (prev_type->data.pointer.is_const && !cur_type->data.pointer.is_const) {
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
@@ -50,6 +50,7 @@ comptime {
     _ = @import("behavior/bugs/4769_b.zig");
     _ = @import("behavior/bugs/4769_c.zig");
     _ = @import("behavior/bugs/4954.zig");
+    _ = @import("behavior/bugs/5413.zig");
     _ = @import("behavior/bugs/5474.zig");
     _ = @import("behavior/bugs/5487.zig");
     _ = @import("behavior/bugs/394.zig");
diff --git a/test/stage1/behavior/bugs/5413.zig b/test/stage1/behavior/bugs/5413.zig
@@ -0,0 +1,6 @@
+const expect = @import("std").testing.expect;
+
+test "Peer type resolution with string literals and unknown length u8 pointers" {
+    expect(@TypeOf("", "a", @as([*:0]const u8, "")) == [*:0]const u8);
+    expect(@TypeOf(@as([*:0]const u8, "baz"), "foo", "bar") == [*:0]const u8);
+}