From 82771e1a14b39e6532836a1d91900c25f1c4096c Mon Sep 17 00:00:00 2001 From: msnyder Date: Sun, 27 Feb 2011 09:01:12 +0000 Subject: [PATCH] 2011-02-26 Michael Snyder * dwarf2loc.c (insert_bits): Avoid shadowing a function param with a local variable of the same name. --- gdb/ChangeLog | 3 +++ gdb/dwarf2loc.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6e7188a606..38ac01c2fb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,8 @@ 2011-02-26 Michael Snyder + * 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 cac9b55788..e516dfa018 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; -- 2.11.0