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

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.

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 5a13b74c0379e1626ee6f5aca10da18b86d399fd..c5df0b0fd0c5dfbe69d93708678665d1e508ad14 100644 (file)
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -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;
    }

diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index cfe02e3b0c1a3a68ad7f243fd7286a8f3b6c2a3c..726bafa7e4b2d673af89ebebee8f106649ee4083 100644 (file)
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -51,6 +51,9 @@ struct _mesa_glsl_parse_state {
     */
    class ir_function_signature *current_function;
 
+   /** Have we found a return statement in this function? */
+   bool found_return;
+
    /** Was there an error during compilation? */
    bool error;