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

Same as earlier: remember the outgoing block of a condition in a ternary since it could be different due to shortened logic

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-25 23:54:15 +01:00
parent bf244fc960
commit 1c9de6763f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ast.c
View file

@ -2179,6 +2179,7 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_
ir_instr *phi;
ir_block *cond = func->curblock;
ir_block *cond_out = NULL;
ir_block *ontrue, *ontrue_out = NULL;
ir_block *onfalse, *onfalse_out = NULL;
ir_block *merge;
@ -2204,6 +2205,7 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_
cgen = self->cond->expression.codegen;
if (!(*cgen)((ast_expression*)(self->cond), func, false, &condval))
return false;
cond_out = func->curblock;
/* create on-true block */
ontrue = ir_function_create_block(ast_ctx(self), func->ir_func, ast_function_label(func, "tern_T"));
@ -2250,7 +2252,7 @@ bool ast_ternary_codegen(ast_ternary *self, ast_function *func, bool lvalue, ir_
return false;
/* create if instruction */
if (!ir_block_create_if(cond, condval, ontrue, onfalse))
if (!ir_block_create_if(cond_out, condval, ontrue, onfalse))
return false;
/* Now enter the merge block */