ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-21 00:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix target list branch rules for name-labelled block/if statements

Browse Source
This commit is contained in:
gingerBill
2019-07-07 16:06:41 +01:00
parent d99ffe604f
commit d7172e168e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+13 -4
View File
@@ -75,6 +75,7 @@ struct irBlock {
struct irTargetList { struct irTargetList {
irTargetList *prev; irTargetList *prev;
bool is_block;
irBlock * break_; irBlock * break_;
irBlock * continue_; irBlock * continue_;
irBlock * fallthrough_; irBlock * fallthrough_;
@@ -5598,7 +5599,7 @@ irBranchBlocks ir_lookup_branch_blocks(irProcedure *proc, Ast *ident) {
} }
void ir_push_target_list(irProcedure *proc, Ast *label, irBlock *break_, irBlock *continue_, irBlock *fallthrough_) { irTargetList *ir_push_target_list(irProcedure *proc, Ast *label, irBlock *break_, irBlock *continue_, irBlock *fallthrough_) {
irTargetList *tl = gb_alloc_item(ir_allocator(), irTargetList); irTargetList *tl = gb_alloc_item(ir_allocator(), irTargetList);
tl->prev = proc->target_list; tl->prev = proc->target_list;
tl->break_ = break_; tl->break_ = break_;
@@ -5616,12 +5617,14 @@ void ir_push_target_list(irProcedure *proc, Ast *label, irBlock *break_, irBlock
if (b->label == label) { if (b->label == label) {
b->break_ = break_; b->break_ = break_;
b->continue_ = continue_; b->continue_ = continue_;
return; return tl;
} }
} }
GB_PANIC("ir_set_label_blocks: Unreachable"); GB_PANIC("ir_set_label_blocks: Unreachable");
} }
return tl;
} }
void ir_pop_target_list(irProcedure *proc) { void ir_pop_target_list(irProcedure *proc) {
@@ -8479,7 +8482,8 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
case_ast_node(bs, BlockStmt, node); case_ast_node(bs, BlockStmt, node);
if (bs->label != nullptr) { if (bs->label != nullptr) {
irBlock *done = ir_new_block(proc, node, "block.done"); irBlock *done = ir_new_block(proc, node, "block.done");
ir_push_target_list(proc, bs->label, done, nullptr, nullptr); irTargetList *tl = ir_push_target_list(proc, bs->label, done, nullptr, nullptr);
tl->is_block = true;
ir_open_scope(proc); ir_open_scope(proc);
ir_build_stmt_list(proc, bs->stmts); ir_build_stmt_list(proc, bs->stmts);
@@ -8596,7 +8600,8 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
ir_start_block(proc, then); ir_start_block(proc, then);
if (is->label != nullptr) { if (is->label != nullptr) {
ir_push_target_list(proc, is->label, done, nullptr, nullptr); irTargetList *tl = ir_push_target_list(proc, is->label, done, nullptr, nullptr);
tl->is_block = true;
} }
ir_build_stmt(proc, is->body); ir_build_stmt(proc, is->body);
@@ -9036,6 +9041,10 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
} }
} else { } else {
for (irTargetList *t = proc->target_list; t != nullptr && block == nullptr; t = t->prev) { for (irTargetList *t = proc->target_list; t != nullptr && block == nullptr; t = t->prev) {
if (t->is_block) {
continue;
}
switch (bs->token.kind) { switch (bs->token.kind) {
case Token_break: block = t->break_; break; case Token_break: block = t->break_; break;
case Token_continue: block = t->continue_; break; case Token_continue: block = t->continue_; break;