From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 7 Jul 2010 18:57:16 +0000 (-0700)
Subject: Revert "glsl2: Put the declaration in the instruction stream before its initializer."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e85f993d8a014b53ad2f6d295cf66d3fb38b091;p=mesa.git

Revert "glsl2: Put the declaration in the instruction stream before its initializer."

This change causes segfaults in other tests.  A fix for both sets of
segfaults is coming.

This reverts commit d4d630b72c7b7f38074addda0f1b819608247d93.
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 3de754fa818..f5e93b02547 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1772,8 +1772,6 @@ ast_declarator_list::hir(exec_list *instructions,
 	 }
       }
 
-      instructions->push_tail(var);
-
       if (decl->initializer != NULL) {
 	 YYLTYPE initializer_loc = decl->initializer->get_location();
 
@@ -1920,6 +1918,8 @@ ast_declarator_list::hir(exec_list *instructions,
 			  decl->identifier);
       }
 
+      instructions->push_tail(var);
+
       /* Add the variable to the symbol table after processing the initializer.
        * This differs from most C-like languages, but it follows the GLSL
        * specification.  From page 28 (page 34 of the PDF) of the GLSL 1.50