mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-31 18:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change rules for how context and defer interact

Browse Source
This commit is contained in:
gingerBill
2018-08-04 23:46:46 +01:00
parent cdbf831a7a
commit d3cada5bd6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ir.cpp
View File

@@ -92,6 +92,7 @@ enum irDeferKind {
struct irDefer {
irDeferKind kind;
isize scope_index;
isize context_stack_count;
irBlock * block;
union {
Ast *stmt;
@@ -115,7 +116,7 @@ struct irDebugLocation {
struct irContextData {
irValue *value;
i32 scope_index;
isize scope_index;
};
struct irProcedure {
@@ -1264,6 +1265,7 @@ void ir_start_block(irProcedure *proc, irBlock *block) {
irDefer ir_add_defer_node(irProcedure *proc, isize scope_index, Ast *stmt) {
irDefer d = {irDefer_Node};
d.scope_index = scope_index;
d.context_stack_count = proc->context_stack.count;
d.block = proc->curr_block;
d.stmt = stmt;
array_add(&proc->defer_stmts, d);
@@ -1750,6 +1752,10 @@ void ir_emit_defer_stmts(irProcedure *proc, irDeferExitKind kind, irBlock *block
isize i = count;
while (i --> 0) {
irDefer d = proc->defer_stmts[i];
if (d.context_stack_count >= 0) {
proc->context_stack.count = d.context_stack_count;
}
if (kind == irDeferExit_Default) {
if (proc->scope_index == d.scope_index &&
d.scope_index > 0) { // TODO(bill): Which is correct: > 0 or > 1?