From fcaa48d9cc8937e0ceb59dfd22ef5b6e6fd1a273 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 22 May 2013 14:57:04 -0700 Subject: [PATCH] glsl: Disallow return with a void argument from void functions. NOTE: This is a candidate for the stable branches. Reviewed-by: Kenneth Graunke --- src/glsl/ast_to_hir.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 22d0cad5079..4b5f04980a3 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -3393,7 +3393,23 @@ ast_jump_statement::hir(exec_list *instructions, state->current_function->function_name(), state->current_function->return_type->name); } - } + } else if (state->current_function->return_type->base_type == + GLSL_TYPE_VOID) { + YYLTYPE loc = this->get_location(); + + /* The ARB_shading_language_420pack, GLSL ES 3.0, and GLSL 4.20 + * specs add a clarification: + * + * "A void function can only use return without a return argument, even if + * the return argument has void type. Return statements only accept values: + * + * void func1() { } + * void func2() { return func1(); } // illegal return statement" + */ + _mesa_glsl_error(& loc, state, + "void functions can only use `return' without a " + "return argument"); + } inst = new(ctx) ir_return(ret); } else { -- 2.30.2