zig

commit b4e40cb59a4d8ee498a0ae5b892bb5907745dc1e (tree)
parent fd4c5f54f05c598c83188409afffea37d4334949
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 26 Jun 2019 00:36:24 -0400

fix peer type resolution with null

Diffstat:
M
src/ir.cpp
 | 
1
+
M
test/stage1/behavior/cast.zig
 | 
14
++++++++++++++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -10399,6 +10399,7 @@ static ZigType *ir_resolve_peer_types(IrAnalyze *ira, AstNode *source_node, ZigT
 
         if (prev_type->id == ZigTypeIdNull) {
             prev_inst = cur_inst;
+            any_are_null = true;
             continue;
         }
 
diff --git a/test/stage1/behavior/cast.zig b/test/stage1/behavior/cast.zig
@@ -482,3 +482,17 @@ test "@intCast to u0 and use the result" {
     S.doTheTest(0, 1, 0);
     comptime S.doTheTest(0, 1, 0);
 }
+
+test "peer type resolution: unreachable, null, slice" {
+    const S = struct {
+        fn doTheTest(num: usize, word: []const u8) void {
+            const result = switch (num) {
+                0 => null,
+                1 => word,
+                else => unreachable,
+            };
+            expect(mem.eql(u8, result.?, "hi"));
+        }
+    };
+    S.doTheTest(1, "hi");
+}