From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 11 Aug 2010 23:58:25 +0000 (-0700)
Subject: glsl2: Don't declare a variable called sig that shadows the other one
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=202604e8160157e4e80b3458175e0170d168e557;p=mesa.git

glsl2: Don't declare a variable called sig that shadows the other one

Accidentally having a variable called 'sig' within an if-statement
cause the higher scope 'sig' to always be NULL.  As a result a new
function signature was created for a function definition even when one
already existed from a prototype declaration.

Fixes piglit test case glsl-function-prototype (bugzilla #29520).
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index f14341c8f72..9d4448f89a8 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2128,7 +2128,7 @@ ast_function::hir(exec_list *instructions,
     */
    f = state->symbols->get_function(name);
    if (f != NULL) {
-      ir_function_signature *sig = f->exact_matching_signature(&hir_parameters);
+      sig = f->exact_matching_signature(&hir_parameters);
       if (sig != NULL) {
 	 const char *badvar = sig->qualifiers_match(&hir_parameters);
 	 if (badvar != NULL) {