Remove second (nested) copy of local var child_die.

gdb/ChangeLog:

	* dwarf2read.c (process_structure_scope): Remove second (nested) copy
	of local var child_die.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0221554ee773259bcf63db2170e99751bd478be7..bff11412a671d6a88d2acf1cd3c5a1e564c51a03 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-25  Doug Evans  <xdje42@gmail.com>
+
+       * dwarf2read.c (process_structure_scope): Remove second (nested) copy
+       of local var child_die.
+
 2014-10-24  Don Breazeal  <donb@codesourcery.com>
 
        * infrun.c (follow_fork_inferior): Update fork message printing

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index eccd11aad4e715de3addf69233d4e34c3587a89c..3f2a127089bc17fb853f1c49426d7285e6f2d62b 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -13016,7 +13016,7 @@ static void
 process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
 {
   struct objfile *objfile = cu->objfile;
-  struct die_info *child_die = die->child;
+  struct die_info *child_die;
   struct type *type;
 
   type = get_die_type (die, cu);
@@ -13026,7 +13026,6 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
   if (die->child != NULL && ! die_is_declaration (die, cu))
     {
       struct field_info fi;
-      struct die_info *child_die;
       VEC (symbolp) *template_args = NULL;
       struct cleanup *back_to = make_cleanup (null_cleanup, 0);
 
@@ -13197,6 +13196,8 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
      current die is a declaration.  Normally, of course, a declaration
      won't have any children at all.  */
 
+  child_die = die->child;
+
   while (child_die != NULL && child_die->tag)
     {
       if (child_die->tag == DW_TAG_member