qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-06 01:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Emit statements for expressions only once

Browse source 
The switch to using expression dags instead of trees meant that the
statement generator could traverse sub-expressions multiple times. This
is inefficient but usually ok if there are no side effects. However,
side effects and branches (usually from ?:, due to labels) break: side
effects happen more than once, and labels get emitted multiple times
resulting in orphaned statement blocks (and, in the end, uninitialized
temporaries).
This commit is contained in:
Bill Currie 2024-02-08 13:41:32 +09:00
parent 701b0f3992
commit cf756eb1a0
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/expr.h
View file

@ -311,6 +311,7 @@ typedef struct {
typedef struct expr_s {
expr_t *next;
struct operand_s *op;
expr_type type; ///< the type of the result of this expression
int line; ///< source line that generated this expression
pr_string_t file; ///< source file that generated this expression

8
tools/qfcc/source/statements.c
View file

@ -2046,7 +2046,13 @@ statement_subexpr (sblock_t *sblock, const expr_t *e, operand_t **op)
internal_error (e, "unexpected sub-expression type: %s",
expr_names[e->type]);
sblock = sfuncs[e->type] (sblock, e, op);
if (e->op) {
*op = e->op;
} else {
sblock = sfuncs[e->type] (sblock, e, op);
//FIXME const cast (store elsewhere)
((expr_t *) e)->op = *op;
}
return sblock;
}