From: Maciej W. Rozycki <macro@imgtec.com>
Date: Mon, 21 Nov 2016 15:59:42 +0000 (+0000)
Subject: BFD/DWARF2: Correct an `index' global shadowing error
X-Git-Tag: users/ARM/embedded-binutils-master-2016q4~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6ddcd85e3c0ae1f12af60efd6d1b97ac4bfa771;p=external%2Fbinutils.git

BFD/DWARF2: Correct an `index' global shadowing error

Fix a commit 089e3718bd8d ("Greatly improve the speed if looking up
DWARF line number information.") build regression:

cc1: warnings being treated as errors
.../bfd/dwarf2.c: In function 'build_line_info_table':
.../bfd/dwarf2.c:1614: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:304: warning: shadowed declaration is here
.../bfd/dwarf2.c: In function 'build_lookup_funcinfo_table':
.../bfd/dwarf2.c:2262: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:304: warning: shadowed declaration is here
make[4]: *** [dwarf2.lo] Error 1

in a way following commit 91d6fa6a035c ("Add -Wshadow to the gcc command
line options used when compiling the binutils.").

	bfd/
	* dwarf2.c (build_line_info_table): Rename `index' local
	variable to `line_index'.
	(build_lookup_funcinfo_table): Rename `index' local variable to
	`func_index'.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f28351d..3f4ffcf 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2016-11-21  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* dwarf2.c (build_line_info_table): Rename `index' local
+	variable to `line_index'.
+	(build_lookup_funcinfo_table): Rename `index' local variable to
+	`func_index'.
+
 2016-11-19  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
 	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Do not
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 287ba0f..e2c8dee 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1611,7 +1611,7 @@ build_line_info_table (struct line_info_table *  table,
   struct line_info** line_info_lookup;
   struct line_info*  each_line;
   unsigned int       num_lines;
-  unsigned int       index;
+  unsigned int       line_index;
 
   if (seq->line_info_lookup != NULL)
     return TRUE;
@@ -1634,11 +1634,11 @@ build_line_info_table (struct line_info_table *  table,
     return FALSE;
 
   /* Create the line information lookup table.  */
-  index = num_lines;
+  line_index = num_lines;
   for (each_line = seq->last_line; each_line; each_line = each_line->prev_line)
-    line_info_lookup[--index] = each_line;
+    line_info_lookup[--line_index] = each_line;
 
-  BFD_ASSERT (index == 0);
+  BFD_ASSERT (line_index == 0);
 
   seq->num_lines = num_lines;
   seq->line_info_lookup = line_info_lookup;
@@ -2259,7 +2259,7 @@ build_lookup_funcinfo_table (struct comp_unit * unit)
   unsigned int number_of_functions = unit->number_of_functions;
   struct funcinfo *each;
   struct lookup_funcinfo *entry;
-  size_t index;
+  size_t func_index;
   struct arange *range;
   bfd_vma low_addr, high_addr;
 
@@ -2273,10 +2273,10 @@ build_lookup_funcinfo_table (struct comp_unit * unit)
     return FALSE;
 
   /* Populate the function info lookup table.  */
-  index = number_of_functions;
+  func_index = number_of_functions;
   for (each = unit->function_table; each; each = each->prev_func)
     {
-      entry = &lookup_funcinfo_table[--index];
+      entry = &lookup_funcinfo_table[--func_index];
       entry->funcinfo = each;
 
       /* Calculate the lowest and highest address for this function entry.  */
@@ -2295,7 +2295,7 @@ build_lookup_funcinfo_table (struct comp_unit * unit)
       entry->high_addr = high_addr;
     }
 
-  BFD_ASSERT (index == 0);
+  BFD_ASSERT (func_index == 0);
 
   /* Sort the function by address.  */
   qsort (lookup_funcinfo_table,
@@ -2305,9 +2305,9 @@ build_lookup_funcinfo_table (struct comp_unit * unit)
 
   /* Calculate the high watermark for each function in the lookup table.  */
   high_addr = lookup_funcinfo_table[0].high_addr;
-  for (index = 1; index < number_of_functions; index++)
+  for (func_index = 1; func_index < number_of_functions; func_index++)
     {
-      entry = &lookup_funcinfo_table[index];
+      entry = &lookup_funcinfo_table[func_index];
       if (entry->high_addr > high_addr)
 	high_addr = entry->high_addr;
       else