RFA: use init_type() in dwarf2read.c

RFA: use init_type() in dwarf2read.c

[Fred Fish]

The dwarf2read.c file sometimes handcrafts new types and sometimes
calls init_type().  This patch eliminates one of the unnecessary
handcraftings.

-Fred


2001-12-08  Fred Fish  <fnf@redhat.com>

	* dwarf2read.c (read_typedef):  Replace hand crafted type
	initialization with a call to the init_type() function, which
	is how the rest of gdb creates types.

Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.38
diff -u -p -r1.38 dwarf2read.c
--- dwarf2read.c	2001/12/07 22:11:51	1.38
+++ dwarf2read.c	2001/12/09 01:28:00
@@ -2886,26 +2882,15 @@ static void
 read_typedef (struct die_info *die, struct objfile *objfile,
 	      const struct comp_unit_head *cu_header)
 {
-  struct type *type;
+  struct attribute *attr;
+  char *name;
 
   if (!die->type)
     {
-      struct attribute *attr;
-      struct type *xtype;
-
-      xtype = die_type (die, objfile, cu_header);
-
-      type = alloc_type (objfile);
-      TYPE_CODE (type) = TYPE_CODE_TYPEDEF;
-      TYPE_FLAGS (type) |= TYPE_FLAG_TARGET_STUB;
-      TYPE_TARGET_TYPE (type) = xtype;
       attr = dwarf_attr (die, DW_AT_name);
-      if (attr && DW_STRING (attr))
-	TYPE_NAME (type) = obsavestring (DW_STRING (attr),
-					 strlen (DW_STRING (attr)),
-					 &objfile->type_obstack);
-
-      die->type = type;
+      name = (attr && DW_STRING (attr)) ? DW_STRING (attr) : NULL;
+      die->type = init_type (TYPE_CODE_TYPEDEF, 0, TYPE_FLAG_TARGET_STUB, name, objfile);
+      TYPE_TARGET_TYPE (die->type) = die_type (die, objfile, cu_header);
     }
 }
 

Re: RFA: use init_type() in dwarf2read.c

[Elena Zannoni]

Fred Fish writes:
 > The dwarf2read.c file sometimes handcrafts new types and sometimes
 > calls init_type().  This patch eliminates one of the unnecessary
 > handcraftings.
 > 
 > -Fred
 > 

Fred, this is OK, but could you please not use the conditional
expression? You can initialize name to NULL at the top, and then just
use an 'if(attr && DW_STRING (attr))'.

Thanks
Elena



 > 
 > 2001-12-08  Fred Fish  <fnf@redhat.com>
 > 
 > 	* dwarf2read.c (read_typedef):  Replace hand crafted type
 > 	initialization with a call to the init_type() function, which
 > 	is how the rest of gdb creates types.
 > 
 > Index: dwarf2read.c
 > ===================================================================
 > RCS file: /cvs/src/src/gdb/dwarf2read.c,v
 > retrieving revision 1.38
 > diff -u -p -r1.38 dwarf2read.c
 > --- dwarf2read.c	2001/12/07 22:11:51	1.38
 > +++ dwarf2read.c	2001/12/09 01:28:00
 > @@ -2886,26 +2882,15 @@ static void
 >  read_typedef (struct die_info *die, struct objfile *objfile,
 >  	      const struct comp_unit_head *cu_header)
 >  {
 > -  struct type *type;
 > +  struct attribute *attr;
 > +  char *name;
 >  
 >    if (!die->type)
 >      {
 > -      struct attribute *attr;
 > -      struct type *xtype;
 > -
 > -      xtype = die_type (die, objfile, cu_header);
 > -
 > -      type = alloc_type (objfile);
 > -      TYPE_CODE (type) = TYPE_CODE_TYPEDEF;
 > -      TYPE_FLAGS (type) |= TYPE_FLAG_TARGET_STUB;
 > -      TYPE_TARGET_TYPE (type) = xtype;
 >        attr = dwarf_attr (die, DW_AT_name);
 > -      if (attr && DW_STRING (attr))
 > -	TYPE_NAME (type) = obsavestring (DW_STRING (attr),
 > -					 strlen (DW_STRING (attr)),
 > -					 &objfile->type_obstack);
 > -
 > -      die->type = type;
 > +      name = (attr && DW_STRING (attr)) ? DW_STRING (attr) : NULL;
 > +      die->type = init_type (TYPE_CODE_TYPEDEF, 0, TYPE_FLAG_TARGET_STUB, name, objfile);
 > +      TYPE_TARGET_TYPE (die->type) = die_type (die, objfile, cu_header);
 >      }
 >  }
 >