From: Weimin Pan <weimin.pan@oracle.com>
Date: Mon, 8 Oct 2018 22:14:11 +0000 (+0000)
Subject: Fix the [-Werror=shadow=local] warning
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a51bb70c8a1570f2e6fa74432578bcdf7f2785aa;p=binutils-gdb.git

Fix the [-Werror=shadow=local] warning

Rename local variable in value_struct_elt_for_reference()
to work around the shadowing a previous local warning.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f074385c309..eac1dc26112 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-08  Weimin Pan  <weimin.pan@oracle.com>
+	* valops.c (value_struct_elt_for_reference): Rename local variable
+	to work around the shadowing a previous local warning.
+
 2018-10-08  John Baldwin  <jhb@FreeBSD.org>
 
 	* Makefile.in (ALLDEPFILES): Add riscv-fbsd-nat.c.
diff --git a/gdb/valops.c b/gdb/valops.c
index 99b12751dca..c45caefbf1e 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3439,9 +3439,9 @@ value_struct_elt_for_reference (struct type *domain, int offset,
 		        mem_offset += boff;
 		      else
 		        {
-		          struct type *t = check_typedef (value_type (this_v));
-		          t = check_typedef (TYPE_TARGET_TYPE (t));
-		          if (get_baseclass_offset (t, curtype, this_v,
+		          struct type *p = check_typedef (value_type (this_v));
+		          p = check_typedef (TYPE_TARGET_TYPE (p));
+		          if (get_baseclass_offset (p, curtype, this_v,
 						    &boff, &isvirt))
 		            mem_offset += boff;
 		        }