darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-23 12:22:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

ast_ifthen_codegen: the merge-jumps for an if's branches need to be added to the endblock of the branch, not the beginning

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-21 18:25:41 +02:00
parent 1f32fe1d8a
commit 426cab1f24
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ast.c
View file

@ -1281,6 +1281,8 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
ir_block *cond = func->curblock;
ir_block *ontrue;
ir_block *onfalse;
ir_block *ontrue_endblock;
ir_block *onfalse_endblock;
ir_block *merge;
/* We don't output any value, thus also don't care about r/lvalue */
@ -1314,6 +1316,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
cgen = self->on_true->expression.codegen;
if (!(*cgen)((ast_expression*)(self->on_true), func, false, &dummy))
return false;
/* we now need to work from the current endpoint */
ontrue_endblock = func->curblock;
} else
ontrue = NULL;
@ -1331,6 +1336,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
cgen = self->on_false->expression.codegen;
if (!(*cgen)((ast_expression*)(self->on_false), func, false, &dummy))
return false;
/* we now need to work from the current endpoint */
onfalse_endblock = func->curblock;
} else
onfalse = NULL;
@ -1340,9 +1348,9 @@ bool ast_ifthen_codegen(ast_ifthen *self, ast_function *func, bool lvalue, ir_va
return false;
/* add jumps ot the merge block */
if (ontrue && !ontrue->final && !ir_block_create_jump(ontrue, merge))
if (ontrue && !ontrue_endblock->final && !ir_block_create_jump(ontrue_endblock, merge))
return false;
if (onfalse && !onfalse->final && !ir_block_create_jump(onfalse, merge))
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 :)