dwarf2out.c (add_pubname_string): Don't check for want_pubnames.

2012-06-29   Cary Coutant  <ccoutant@google.com>

gcc/
	* dwarf2out.c (add_pubname_string): Don't check for want_pubnames.
	(gen_subprogram_die): Don't add pubname if want_pubnames is false.
	(gen_variable_die): Likewise.
	(gen_namespace_die): Likewise.

From-SVN: r189094

gcc/ChangeLog

+2012-06-29   Cary Coutant  <ccoutant@google.com>
+
+	* dwarf2out.c (add_pubname_string): Don't check for want_pubnames.
+	(gen_subprogram_die): Don't add pubname if want_pubnames is false.
+	(gen_variable_die): Likewise.
+	(gen_namespace_die): Likewise.
+
 2012-06-29  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* tree-eh.c (lower_try_finally_switch): Really put the location of the

gcc/dwarf2out.c

@@ -8152,14 +8152,11 @@ dwarf2_name (tree decl, int scope)
 static void
 add_pubname_string (const char *str, dw_die_ref die)
 {
-  if (want_pubnames ())
-    {
   pubname_entry e;
 
   e.die = die;
   e.name = xstrdup (str);
   VEC_safe_push (pubname_entry, gc, pubname_table, &e);
-    }
 }
 
 static void
@@ -17146,6 +17143,7 @@ gen_subprogram_die (tree decl, dw_die_ref context_die)
 		  add_AT_lbl_id (seg_die, DW_AT_high_pc,
 				 fde->dw_fde_second_end);
 		  add_name_attribute (seg_die, name);
+		  if (want_pubnames ())
 		    add_pubname_string (name, seg_die);
 		}
 	    }
@@ -17571,6 +17569,7 @@ gen_variable_die (tree decl, tree origin, dw_die_ref context_die)
 	    }
           else if (DECL_EXTERNAL (decl))
 	    add_AT_flag (com_die, DW_AT_declaration, 1);
+	  if (want_pubnames ())
 	    add_pubname_string (cnam, com_die); /* ??? needed? */
 	  com_die->decl_id = DECL_UID (com_decl);
 	  slot = htab_find_slot (common_block_die_table, com_die, INSERT);
@@ -19197,6 +19196,7 @@ gen_namespace_die (tree decl, dw_die_ref context_die)
       equate_decl_number_to_die (decl, namespace_die);
     }
   /* Bypass dwarf2_name's check for DECL_NAMELESS.  */
+  if (want_pubnames ())
     add_pubname_string (lang_hooks.dwarf_name (decl, 1), namespace_die);
 }