[Mesa-dev] [PATCH 1/3] glsl: use 'declared_var' instead of 'var' after checking redeclarations

[Mark Janes]

Sorry for the interruption to the CI's uptime.  It looks like one of our
developers force-pushed to the master branch of our automation, which
generated a merge conflict in our automation.

I've fixed it.

-Mark

Iago Toral <itoral at igalia.com> writes:

> Mark, I could not run this series through jenkins, it seems to be down
> at the moment since I don't get any e-mails from it after pushing to my
> jenkins branch, so I ran piglit and OpenGL 4.5 CTS locally and didn't
> see any regressions, so I think everything should be fine.
>
> Iago
>
> On Wed, 2017-09-13 at 12:46 +0200, Iago Toral Quiroga wrote:
>> Since the original 'var' might have been deleted from this point
>> forward.
>> 
>> Bugzila: https://bugs.freedesktop.org/show_bug.cgi?id=102685
>> Fixes: 51bf007d2c27fba (glsl: Disallow unsized array of atomic_uint)
>> ---
>>  src/compiler/glsl/ast_to_hir.cpp | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/src/compiler/glsl/ast_to_hir.cpp
>> b/src/compiler/glsl/ast_to_hir.cpp
>> index 9ded2cbda7..6dd0f1dfaa 100644
>> --- a/src/compiler/glsl/ast_to_hir.cpp
>> +++ b/src/compiler/glsl/ast_to_hir.cpp
>> @@ -5547,8 +5547,8 @@ ast_declarator_list::hir(exec_list
>> *instructions,
>>         *    "It is a compile-time error to declare an unsized array
>> of
>>         *     atomic_uint"
>>         */
>> -      if (var->type->is_unsized_array() &&
>> -          var->type->without_array()->base_type ==
>> GLSL_TYPE_ATOMIC_UINT) {
>> +      if (declared_var->type->is_unsized_array() &&
>> +          declared_var->type->without_array()->base_type ==
>> GLSL_TYPE_ATOMIC_UINT) {
>>           _mesa_glsl_error(& loc, state,
>>                            "Unsized array of atomic_uint is not
>> allowed");
>>        }