diff mbox

[COMMITTED] Remove second (nested) copy of local var child_die.

Message ID m34murmo44.fsf@sspiff.org
State Committed
Headers

Commit Message

Doug Evans Oct. 26, 2014, 4:49 a.m. UTC 
  Hi.

This function was a bit confusing to read given
the outer child_die was initialized way early and used way late.

Committed.

2014-10-25  Doug Evans  <xdje42@gmail.com>

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

Patch

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index eccd11a..3f2a127 100644
--- 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