zig

commit 61a53a587558ff1fe1b0ec98bb424022885edccf (tree)
parent ac52e005640e9dc7829356f857a82b0bc3894245
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sat,  2 Oct 2021 19:09:54 -0700

AstGen: fix if, orelse, catch, with unreachable bodies

Before, the system to replace a result location pointer with a
traditional break instruction did not notice the case when one of the
bodies was unreachable. Now, the emitted ZIR code is improved and
simplified in this case, resulting in a new passing behavior test.

Diffstat:
M
src/AstGen.zig
 | 
14
++++++++++----
M
test/behavior/if.zig
 | 
8
++++++++
M
test/behavior/if_stage1.zig
 | 
11
-----------

3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/AstGen.zig b/src/AstGen.zig
@@ -4891,7 +4891,7 @@ fn orelseCatchExpr(
     // We cannot use `block_scope.break_result_loc` because that has the bare
     // type, whereas this expression has the optional type. Later we make
     // up for this fact by calling rvalue on the else branch.
-    const operand = try expr(&block_scope, &block_scope.base, operand_rl, lhs);
+    const operand = try reachableExpr(&block_scope, &block_scope.base, operand_rl, lhs, rhs);
     const cond = try block_scope.addUnNode(cond_op, operand, node);
     const condbr = try block_scope.addCondBr(.condbr, node);
 
@@ -4930,8 +4930,10 @@ fn orelseCatchExpr(
         break :blk &err_val_scope.base;
     };
 
-    block_scope.break_count += 1;
     const else_result = try expr(&else_scope, else_sub_scope, block_scope.break_result_loc, rhs);
+    if (!else_scope.endsWithNoReturn()) {
+        block_scope.break_count += 1;
+    }
     try checkUsed(parent_gz, &else_scope.base, else_sub_scope);
 
     // We hold off on the break instructions as well as copying the then/else
@@ -5249,8 +5251,10 @@ fn ifExpr(
         }
     };
 
-    block_scope.break_count += 1;
     const then_result = try expr(&then_scope, then_sub_scope, block_scope.break_result_loc, if_full.ast.then_expr);
+    if (!then_scope.endsWithNoReturn()) {
+        block_scope.break_count += 1;
+    }
     try checkUsed(parent_gz, &then_scope.base, then_sub_scope);
     // We hold off on the break instructions as well as copying the then/else
     // instructions into place until we know whether to keep store_to_block_ptr
@@ -5264,7 +5268,6 @@ fn ifExpr(
         src: Ast.Node.Index,
         result: Zir.Inst.Ref,
     } = if (else_node != 0) blk: {
-        block_scope.break_count += 1;
         const sub_scope = s: {
             if (if_full.error_token) |error_token| {
                 const tag: Zir.Inst.Tag = if (payload_is_ref)
@@ -5291,6 +5294,9 @@ fn ifExpr(
             }
         };
         const e = try expr(&else_scope, sub_scope, block_scope.break_result_loc, else_node);
+        if (!else_scope.endsWithNoReturn()) {
+            block_scope.break_count += 1;
+        }
         try checkUsed(parent_gz, &else_scope.base, sub_scope);
         break :blk .{
             .src = else_node,
diff --git a/test/behavior/if.zig b/test/behavior/if.zig
@@ -65,3 +65,11 @@ test "labeled break inside comptime if inside runtime if" {
     }
     try expect(answer == 42);
 }
+
+test "const result loc, runtime if cond, else unreachable" {
+    const Num = enum { One, Two };
+
+    var t = true;
+    const x = if (t) Num.Two else unreachable;
+    try expect(x == .Two);
+}
diff --git a/test/behavior/if_stage1.zig b/test/behavior/if_stage1.zig
@@ -2,17 +2,6 @@ const std = @import("std");
 const expect = std.testing.expect;
 const expectEqual = std.testing.expectEqual;
 
-test "const result loc, runtime if cond, else unreachable" {
-    const Num = enum {
-        One,
-        Two,
-    };
-
-    var t = true;
-    const x = if (t) Num.Two else unreachable;
-    try expect(x == .Two);
-}
-
 test "if prongs cast to expected type instead of peer type resolution" {
     const S = struct {
         fn doTheTest(f: bool) !void {