diff options
| author | Michael Snyder <msnyder@vmware.com> | 2011-02-27 00:01:12 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@vmware.com> | 2011-02-27 00:01:12 +0000 |
| commit | 8c814cdde7fd000c640b4158b6492038b3e4d6dc (patch) | |
| tree | ee285c4c7fdb1fa8d2091d903d232fb08b4f60ed /gdb | |
| parent | a3ddeb6f68740481195f5b8146d272e88d738093 (diff) | |
| download | gdb-8c814cdde7fd000c640b4158b6492038b3e4d6dc.zip gdb-8c814cdde7fd000c640b4158b6492038b3e4d6dc.tar.gz gdb-8c814cdde7fd000c640b4158b6492038b3e4d6dc.tar.bz2 | |
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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 3 | ||||
| -rw-r--r-- | gdb/dwarf2loc.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6e7188a..38ac01c 100644 --- 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 cac9b55..e516dfa 100644 --- 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; |