Re: [rfa] function parameter shadowed by local variable in opencl-lang.c

[Michael Snyder <msnyder@vmware.com>]

[-- Attachment #1: Type: text/plain, Size: 442 bytes --]

Ulrich Weigand wrote:
> Joel Brobecker wrote:
>>>> Probably this wasn't intentional?
>>>>
>>> Oops, another instance of the same thing:
>> I wish the compiler would warn us about things like this...  The patch
>> looks correct to me, but I will let Ken and Ulrich take a look. Perhaps
>> they'll be able to suggest a more specific name than `length2' ;-).
> 
> I guess I'd go with something along these lines ...

So committed, as attached.


[-- Attachment #2: rename.txt --]
[-- Type: text/plain, Size: 1512 bytes --]

2011-02-28  Michael Snyder  <msnyder@vmware.com>

	* opencl-lang.c (lval_func_check_validity): Rename inner variables.
	(lval_func_check_synthetic_pointer): Ditto.

Index: opencl-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/opencl-lang.c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 opencl-lang.c
--- opencl-lang.c	28 Feb 2011 18:31:36 -0000	1.8
+++ opencl-lang.c	28 Feb 2011 18:39:17 -0000
@@ -263,11 +263,11 @@ lval_func_check_validity (const struct v
 
   for (i = start; i < end; i++)
     {
-      int startoffset = (i == start) ? startrest : 0;
-      int length = (i == end) ? endrest : elsize;
+      int comp_offset = (i == start) ? startrest : 0;
+      int comp_length = (i == end) ? endrest : elsize;
 
-      if (!value_bits_valid (c->val, c->indices[i] * elsize + startoffset,
-			     length))
+      if (!value_bits_valid (c->val, c->indices[i] * elsize + comp_offset,
+			     comp_length))
 	return 0;
     }
 
@@ -317,12 +317,12 @@ lval_func_check_synthetic_pointer (const
 
   for (i = start; i < end; i++)
     {
-      int startoffset = (i == start) ? startrest : 0;
-      int length = (i == end) ? endrest : elsize;
+      int comp_offset = (i == start) ? startrest : 0;
+      int comp_length = (i == end) ? endrest : elsize;
 
       if (!value_bits_synthetic_pointer (c->val,
-					 c->indices[i] * elsize + startoffset,
-					 length))
+					 c->indices[i] * elsize + comp_offset,
+					 comp_length))
 	return 0;
     }