KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ast_to_hir: Fix crash when a function shadows a variable. 

The code would attempt to add a new signature to the ir_function, which
didn't exist.  Simply bailing out/returning early seems reasonable.

Fixes piglit test redeclaration-02.vert, and fixes a crash in
redeclaration-03.vert (the test still fails).
This commit is contained in:
Kenneth Graunke 2010-08-20 02:04:52 -07:00
parent e0ef4800f5
commit 826a39cb14
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/glsl/ast_to_hir.cpp
View File

@ -2149,7 +2149,6 @@ ast_function::hir(exec_list *instructions,
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state, "function `%s' redefined", name);
sig = NULL;
}
}
} else if (state->symbols->name_declared_this_scope(name)) {
@ -2159,7 +2158,7 @@ ast_function::hir(exec_list *instructions,
_mesa_glsl_error(& loc, state, "function name `%s' conflicts with "
"non-function", name);
sig = NULL;
return NULL;
} else {
f = new(ctx) ir_function(name);
state->symbols->add_function(f->name, f);
@ -2207,6 +2206,8 @@ ast_function_definition::hir(exec_list *instructions,
prototype->hir(instructions, state);
ir_function_signature *signature = prototype->signature;
if (signature == NULL)
return NULL;
assert(state->current_function == NULL);
state->current_function = signature;