OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl2: Check for non-void functions that don't have a return statement.

Browse Source 
This doesn't do any control flow analysis to ensure that the return
statements are actually reached.

Fixes piglit tests function5.frag and function-07.vert.
This commit is contained in:
Kenneth Graunke
2010-06-29 09:59:40 -07:00
committed by Ian Romanick
parent ac04c257e3
commit 6de8256505
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glsl/ast_to_hir.cpp
View File

@@ -2097,6 +2097,7 @@ ast_function_definition::hir(exec_list *instructions,
assert(state->current_function == NULL);
state->current_function = signature;
state->found_return = false;
/* Duplicate parameters declared in the prototype as concrete variables.
* Add these to the symbol table.
@@ -2128,6 +2129,14 @@ ast_function_definition::hir(exec_list *instructions,
assert(state->current_function == signature);
state->current_function = NULL;
if (!signature->return_type->is_void() && !state->found_return) {
YYLTYPE loc = this->get_location();
_mesa_glsl_error(& loc, state, "function `%s' has non-void return type "
"%s, but no return statement",
signature->function_name(),
signature->return_type->name);
}
/* Function definitions do not have r-values.
*/
return NULL;
@@ -2186,6 +2195,7 @@ ast_jump_statement::hir(exec_list *instructions,
inst = new(ctx) ir_return;
}
state->found_return = true;
instructions->push_tail(inst);
break;
}