authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-14 19:21:19-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-14 19:21:19-07:00
logf0bac8037ca373be4796fcedeb4b40bc40a5e846
treee879a88e245b20b33ac8c2d3f76e263680d461b6
parenta5934edd480909554476df26b38453a0c07ad505

Sema: fix compilation errors

Commit 8afafa717f5c036595a3a781c63b6be7b478c025 passed CI checks against an older codebase and accumulated silent conflicts.

1 files changed, 3 insertions(+), 3 deletions(-)

src/Sema.zig+3-3
...@@ -32598,7 +32598,7 @@ fn analyzeSlice(...@@ -32598,7 +32598,7 @@ fn analyzeSlice(
32598 );32598 );
3259932599
32600 if (try sema.compareScalar(start_value, .neq, end_value, Type.comptime_int)) {32600 if (try sema.compareScalar(start_value, .neq, end_value, Type.comptime_int)) {
32601 if (try sema.compareScalar(start_value, .neq, InternPool.Index.zero.toValue(), Type.comptime_int)) {32601 if (try sema.compareScalar(start_value, .neq, Value.zero_comptime_int, Type.comptime_int)) {
32602 const err_msg = try sema.errMsg(block, start_src, bounds_error_message, .{});32602 const err_msg = try sema.errMsg(block, start_src, bounds_error_message, .{});
32603 try sema.errNote(32603 try sema.errNote(
32604 block,32604 block,
...@@ -32611,7 +32611,7 @@ fn analyzeSlice(...@@ -32611,7 +32611,7 @@ fn analyzeSlice(
32611 },32611 },
32612 );32612 );
32613 return sema.failWithOwnedErrorMsg(block, err_msg);32613 return sema.failWithOwnedErrorMsg(block, err_msg);
32614 } else if (try sema.compareScalar(end_value, .neq, InternPool.Index.one.toValue(), Type.comptime_int)) {32614 } else if (try sema.compareScalar(end_value, .neq, Value.one_comptime_int, Type.comptime_int)) {
32615 const err_msg = try sema.errMsg(block, end_src, bounds_error_message, .{});32615 const err_msg = try sema.errMsg(block, end_src, bounds_error_message, .{});
32616 try sema.errNote(32616 try sema.errNote(
32617 block,32617 block,
...@@ -32626,7 +32626,7 @@ fn analyzeSlice(...@@ -32626,7 +32626,7 @@ fn analyzeSlice(
32626 return sema.failWithOwnedErrorMsg(block, err_msg);32626 return sema.failWithOwnedErrorMsg(block, err_msg);
32627 }32627 }
32628 } else {32628 } else {
32629 if (try sema.compareScalar(end_value, .gt, InternPool.Index.one.toValue(), Type.comptime_int)) {32629 if (try sema.compareScalar(end_value, .gt, Value.one_comptime_int, Type.comptime_int)) {
32630 return sema.fail(32630 return sema.fail(
32631 block,32631 block,
32632 end_src,32632 end_src,