Commit 096763de9808efa996d248815d4ac913381aa1b4 | zig

author	Matthew Borkowski <matthew.h.borkowski@gmail.com> 2021-10-23 18:49:23-04:00
committer	Matthew Borkowski <matthew.h.borkowski@gmail.com> 2021-10-23 18:49:23-04:00
log	096763de9808efa996d248815d4ac913381aa1b4
tree	360de68f09c5bb95943298b59161293296bba6dd
parent	ee98d8700818aa667137e3aa580b16df2ba6d680

1 files changed, 14 insertions(+), 7 deletions(-)

src/AstGen.zig+14-7

 @@ -8514,10 +8514,10 @@ fn nodeMayEvalToError(tree: *const Ast, start_node: Ast.Node.Index) enum { never
             .unwrap_optional,
             => node = node_datas[node].lhs,
-            // Forward the question to the RHS sub-expression.
+            // LHS sub-expression may still be an error under the outer optional or error union
             .@"catch",
             .@"orelse",
-            => node = node_datas[node].rhs,
+            => return .maybe,
             .block_two,
             .block_two_semicolon,
 @@ -8544,11 +8544,18 @@ fn nodeMayEvalToError(tree: *const Ast, start_node: Ast.Node.Index) enum { never
                 // If the builtin is an invalid name, we don't cause an error here; instead
                 // let it pass, and the error will be "invalid builtin function" later.
                 const builtin_info = BuiltinFn.list.get(builtin_name) orelse return .maybe;
-                if (builtin_info.tag == .err_set_cast) {
+                return switch (builtin_info.tag) {
-                    return .always;
+                    .as,
-                } else {
+                    .call,
-                    return .never;
+                    .field,
-                }
+                    => .maybe,
+                    .err_set_cast,
+                    .int_to_error,
+                    => .always,
+                    else => .never,
+                };
             },
         }
     }