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

	* dwarf2loc.c (insert_bits): Avoid shadowing a function param
	with a local variable of the same name.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e7188a60637050e08dc8e115066ce093f57a4ee..38ac01c2fb8a861387deac35b0ee6bfa9941251e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-26  Michael Snyder  <msnyder@vmware.com>
 
+       * dwarf2loc.c (insert_bits): Avoid shadowing a function param
+       with a local variable of the same name.
+
        * i387-tdep.c (i387_supply_fxsave): Avoid shadowing a function
        param with a local variable of the same name.
        (i387_supply_xsave): Ditto.

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index cac9b557883a2950b0aa55085673e4a21444a911..e516dfa0188cd473a59a0fe00c65b69204940cd7 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -422,7 +422,7 @@ insert_bits (unsigned int datum,
 {
   unsigned int mask;
 
-  gdb_assert (dest_offset_bits >= 0 && dest_offset_bits + nbits <= 8);
+  gdb_assert (dest_offset_bits + nbits <= 8);
 
   mask = (1 << nbits) - 1;
   if (bits_big_endian)
@@ -1159,7 +1159,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
        case DWARF_VALUE_LITERAL:
          {
            bfd_byte *contents;
-           const bfd_byte *data;
+           const bfd_byte *ldata;
            size_t n = ctx->len;
 
            if (byte_offset + TYPE_LENGTH (type) > n)
@@ -1168,12 +1168,12 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
            retval = allocate_value (type);
            contents = value_contents_raw (retval);
 
-           data = ctx->data + byte_offset;
+           ldata = ctx->data + byte_offset;
            n -= byte_offset;
 
            if (n > TYPE_LENGTH (type))
              n = TYPE_LENGTH (type);
-           memcpy (contents, data, n);
+           memcpy (contents, ldata, n);
          }
          break;