darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-31 20:10:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong merge_id

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-21 19:55:12 +01:00
parent de5592dfc5
commit 268ad7db53
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

@ -1532,7 +1532,7 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
* but we translate this to (!(!a ? !a : !b)) * but we translate this to (!(!a ? !a : !b))
*/ */
merge_id = vec_size(func->blocks); merge_id = vec_size(func->ir_func->blocks);
merge = ir_function_create_block(func->ir_func, ast_function_label(func, "sce_merge")); merge = ir_function_create_block(func->ir_func, ast_function_label(func, "sce_merge"));
cgen = self->left->expression.codegen; cgen = self->left->expression.codegen;
@ -1601,6 +1601,8 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
notop, notop,
*out); *out);
} }
if (!*out)
return false;
self->expression.outr = *out; self->expression.outr = *out;
return true; return true;
} }