mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-18 20:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #622 on both backends

Browse Source
This commit is contained in:
gingerBill
2020-05-13 23:00:34 +01:00
parent 482c687462
commit 2630e9ced1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ir.cpp
View File

@@ -3307,10 +3307,9 @@ void ir_emit_defer_stmts(irProcedure *proc, irDeferExitKind kind, irBlock *block
while (i --> 0) {
irDefer d = proc->defer_stmts[i];
// TODO(bill, 2020-03-05): Why was this added?
// if (proc->context_stack.count >= d.context_stack_count) {
// proc->context_stack.count = d.context_stack_count;
// }
isize prev_context_stack_count = proc->context_stack.count;
defer (proc->context_stack.count = prev_context_stack_count);
proc->context_stack.count = d.context_stack_count;
if (kind == irDeferExit_Default) {
if (proc->scope_index == d.scope_index &&

5
src/llvm_backend.cpp
View File

@@ -6432,6 +6432,11 @@ void lb_build_defer_stmt(lbProcedure *p, lbDefer d) {
return;
}
isize prev_context_stack_count = p->context_stack.count;
defer (p->context_stack.count = prev_context_stack_count);
p->context_stack.count = d.context_stack_count;
lbBlock *b = lb_create_block(p, "defer");
if (last_instr == nullptr || !LLVMIsATerminatorInst(last_instr)) {
lb_emit_jump(p, b);