zig

commit 924dd674e2e584bbef5e7650f481e49829c8fe28 (tree)
parent 6cddf9d7238a58b88064c3f3ce6e3948143598d8
Author: LemonBoy <thatlemon@gmail.com>
Date:   Sun, 17 Nov 2019 16:55:38 +0100

Catch invalid type from peer resolution

Fixes #3703

Diffstat:
M
src/ir.cpp
 | 
2
++
M
test/compile_errors.zig
 | 
12
++++++++++++

2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -17695,6 +17695,8 @@ static IrInstruction *ir_analyze_instruction_phi(IrAnalyze *ira, IrInstructionPh
             peer_parent->resolved_type = ir_resolve_peer_types(ira,
                     peer_parent->base.source_instruction->source_node, expected_type, instructions,
                     peer_parent->peers.length);
+            if (type_is_invalid(peer_parent->resolved_type))
+                return ira->codegen->invalid_instruction;
 
             // the logic below assumes there are no instructions in the new current basic block yet
             ir_assert(ira->new_irb.current_basic_block->instruction_list.length == 0, &phi_instruction->base);
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
@@ -3,6 +3,18 @@ const builtin = @import("builtin");
 
 pub fn addCases(cases: *tests.CompileErrorContext) void {
     cases.add(
+        "missing result type for phi node",
+        \\fn foo() !void {
+        \\    return anyerror.Foo;
+        \\}
+        \\export fn entry() void {
+        \\    foo() catch 0;
+        \\}
+    ,
+        "tmp.zig:5:17: error: integer value 0 cannot be coerced to type 'void'",
+    );
+
+    cases.add(
         "atomicrmw with enum op not .Xchg",
         \\export fn entry() void {
         \\    const E = enum(u8) {