From: Wolfgang (Blub) Bumiller Date: Fri, 30 Nov 2012 11:23:27 +0000 (+0100) Subject: Still need to generate the jump... X-Git-Tag: 0.1.9~192 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42376513e7f81afd41b4d504d81171b40e490da3;p=xonotic%2Fgmqcc.git Still need to generate the jump... --- diff --git a/ast.c b/ast.c index 7afe3fb..417fc15 100644 --- a/ast.c +++ b/ast.c @@ -2082,7 +2082,7 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va ir_block *onfalse; ir_block *ontrue_endblock = NULL; ir_block *onfalse_endblock = NULL; - ir_block *merge; + ir_block *merge = NULL; /* We don't output any value, thus also don't care about r/lvalue */ (void)out; @@ -2154,19 +2154,19 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va if (onfalse && !onfalse_endblock->final && !ir_block_create_jump(onfalse_endblock, merge)) return false; - /* we create the if here, that way all blocks are ordered :) - */ - if (!ir_block_create_if(cond, condval, - (ontrue ? ontrue : merge), - (onfalse ? onfalse : merge))) - { - return false; - } - /* Now enter the merge block */ func->curblock = merge; } + /* we create the if here, that way all blocks are ordered :) + */ + if (!ir_block_create_if(cond, condval, + (ontrue ? ontrue : merge), + (onfalse ? onfalse : merge))) + { + return false; + } + return true; }