ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #580 defer bug

Browse Source
This commit is contained in:
gingerBill
2020-03-05 20:58:59 +00:00
parent 01b1385672
commit c213d72ec6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+5 -7
View File
@@ -3103,10 +3103,6 @@ irValue *ir_find_or_generate_context_ptr(irProcedure *proc) {
return proc->context_stack[proc->context_stack.count-1].value; return proc->context_stack[proc->context_stack.count-1].value;
} }
// irBlock *tmp_block = proc->curr_block;
// proc->curr_block = proc->blocks[0];
// defer (proc->curr_block = tmp_block);
irValue *c = ir_add_local_generated(proc, t_context, true); irValue *c = ir_add_local_generated(proc, t_context, true);
ir_push_context_onto_stack(proc, c); ir_push_context_onto_stack(proc, c);
ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context)); ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context));
@@ -3300,9 +3296,11 @@ void ir_emit_defer_stmts(irProcedure *proc, irDeferExitKind kind, irBlock *block
isize i = count; isize i = count;
while (i --> 0) { while (i --> 0) {
irDefer d = proc->defer_stmts[i]; irDefer d = proc->defer_stmts[i];
if (proc->context_stack.count >= d.context_stack_count) {
proc->context_stack.count = d.context_stack_count; // 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;
// }
if (kind == irDeferExit_Default) { if (kind == irDeferExit_Default) {
if (proc->scope_index == d.scope_index && if (proc->scope_index == d.scope_index &&