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

[qfcc] Force symbol lookup when processing expressions

Browse source 
This fixes the constant type reference ICE for subpassLoad. The problem
was stale symbols recorded in the expressions thus gsubpassInput
referred to the allowed types for the generic function rather than the
type specific to the call.
This commit is contained in:
Bill Currie 2025-01-22 18:43:19 +09:00
parent 5b9d241177
commit e7d3259829
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/include/rua-lang.h
View file

@ -221,6 +221,7 @@ typedef struct rua_ctx_s {
void *scanner;
language_t *language;
bool extdecl;
bool force_lookup;
} rua_ctx_t;
extern language_t lang_ruamoko;

3
tools/qfcc/source/expr_process.c
View file

@ -939,6 +939,8 @@ expr_process (const expr_t *expr, rua_ctx_t *ctx)
expr_names[expr->type]);
}
bool force_lookup = ctx->force_lookup;
ctx->force_lookup = true;
auto proc = funcs[expr->type] (expr, ctx);
proc = edag_add_expr (proc);
if (proc && proc->type == ex_process) {
@ -949,6 +951,7 @@ expr_process (const expr_t *expr, rua_ctx_t *ctx)
proc = expr_process (proc->process.expr, ctx);
current_func = func;
}
ctx->force_lookup = force_lookup;
return proc;
}

2
tools/qfcc/source/expr_type.c
View file

@ -894,7 +894,7 @@ resolve_type (const expr_t *te, rua_ctx_t *ctx)
{
if (te->type == ex_symbol) {
auto sym = te->symbol;
if (sym->sy_type == sy_name) {
if (ctx->force_lookup || sym->sy_type == sy_name) {
sym = symtab_lookup (current_symtab, sym->name);
if (sym && sym->sy_type == sy_type_param) {
te = sym->expr;