Simple -Wshadow=local fixes

[deliverable/binutils-gdb.git] / gdb / dwarf2expr.c

diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index f1ca033389ab8163b3e6e81d7eccf0232a22db2c..0387ef5089123aecd989284673d0c5698062c8bf 100644 (file)
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -952,12 +952,12 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr,
               from the type length, we need to zero-extend it.  */
            if (TYPE_LENGTH (type) != addr_size)
              {
-               ULONGEST result =
+               ULONGEST datum =
                  extract_unsigned_integer (buf, addr_size, byte_order);
 
                buf = (gdb_byte *) alloca (TYPE_LENGTH (type));
                store_unsigned_integer (buf, TYPE_LENGTH (type),
-                                       byte_order, result);
+                                       byte_order, datum);
              }
 
            result_val = value_from_contents_and_address (type, buf, addr);
@@ -1218,12 +1218,12 @@ dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr,
 
        case DW_OP_bit_piece:
          {
-           uint64_t size, offset;
+           uint64_t size, uleb_offset;
 
             /* Record the piece.  */
            op_ptr = safe_read_uleb128 (op_ptr, op_end, &size);
-           op_ptr = safe_read_uleb128 (op_ptr, op_end, &offset);
-           add_piece (size, offset);
+           op_ptr = safe_read_uleb128 (op_ptr, op_end, &uleb_offset);
+           add_piece (size, uleb_offset);
 
             /* Pop off the address/regnum, and reset the location
               type.  */