mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-24 23:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

zir-memory-layout: fix @setEvalBranchQuota

Browse Source 
also make emitBackwardBranch fail correctly
This commit is contained in:
jacob gw 2021-03-16 08:12:11 -04:00 committed by Andrew Kelley
parent 099af0e008
commit e430f3f7e0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Sema.zig
View File

@ -599,8 +599,8 @@ fn zirSetEvalBranchQuota(
const src = inst_data.src();
try sema.requireFunctionBlock(block, src);
const quota = try sema.resolveAlreadyCoercedInt(block, src, inst_data.operand, u32);
if (b.branch_quota.* < quota)
b.branch_quota.* = quota;
if (sema.branch_quota < quota)
sema.branch_quota = quota;
return sema.mod.constVoid(block.arena, .unneeded);
}
@ -2960,11 +2960,9 @@ fn safetyPanic(sema: *Sema, block: *Scope.Block, src: LazySrcLoc, panic_id: Pani
fn emitBackwardBranch(sema: *Sema, block: *Scope.Block, src: LazySrcLoc) !void {
const shared = block.inlining.?.shared;
shared.branch_count += 1;
if (shared.branch_count > block.branch_quota.*) {
if (shared.branch_count > sema.branch_quota) {
// TODO show the "called from here" stack
return mod.fail(&block.base, src, "evaluation exceeded {d} backwards branches", .{
block.branch_quota.*,
});
return sema.mod.fail(&block.base, src, "evaluation exceeded {d} backwards branches", .{sema.branch_quota});
}
}