remove nolonger needed {cgraph,varpool}_node_{,asm_}name () functions

From-SVN: r204946

4 files changed, 14 insertions, 10 deletions

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index b3bed0b..266d00f 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-18  Trevor Saunders  <tsaunders@mozilla.com>
+
+	* lto-partition.c lto-symtab.c lto.c Adjust.
+
 2013-10-31  David Malcolm  <dmalcolm@redhat.com>
 
 	Automated part of renaming of symtab_node_base to symtab_node.
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 6a3d881..e0d020d 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -197,7 +197,7 @@ add_symbol_to_partition_1 (ltrans_partition part, symtab_node *node)
       node->in_other_partition = 1;
       if (cgraph_dump_file)
         fprintf (cgraph_dump_file, "Symbol node %s now used in multiple partitions\n",
-		 symtab_node_name (node));
+		 node->name ());
     }
   node->aux = (void *)((size_t)node->aux + 1);
 
@@ -381,7 +381,7 @@ lto_max_map (void)
       if (get_symbol_class (node) != SYMBOL_PARTITION
 	  || symbol_partitioned_p (node))
 	continue;
-      partition = new_partition (symtab_node_asm_name (node));
+      partition = new_partition (node->asm_name ());
       add_symbol_to_partition (partition, node);
       npartitions++;
     }
@@ -688,7 +688,7 @@ lto_balanced_map (void)
       if (cgraph_dump_file)
 	fprintf (cgraph_dump_file, "Step %i: added %s/%i, size %i, cost %i/%i "
 		 "best %i/%i, step %i\n", i,
-		 cgraph_node_name (order[i]), order[i]->order,
+		 order[i]->name (), order[i]->order,
 		 partition->insns, cost, internal,
 		 best_cost, best_internal, best_i);
       /* Partition is too large, unwind into step when best cost was reached and
@@ -824,7 +824,7 @@ promote_symbol (symtab_node *node)
   DECL_VISIBILITY_SPECIFIED (node->decl) = true;
   if (cgraph_dump_file)
     fprintf (cgraph_dump_file,
-	    "Promoting as hidden: %s\n", symtab_node_name (node));
+	    "Promoting as hidden: %s\n", node->name ());
 }
 
 /* Return true if NODE needs named section even if it won't land in the partition
@@ -885,7 +885,7 @@ rename_statics (lto_symtab_encoder_t encoder, symtab_node *node)
 
   if (cgraph_dump_file)
     fprintf (cgraph_dump_file,
-	    "Renaming statics with asm name: %s\n", symtab_node_name (node));
+	    "Renaming statics with asm name: %s\n", node->name ());
 
   /* Assign every symbol in the set that shares the same ASM name an unique
      mangled name.  */
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 2ebc07d..7c7075e 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -45,8 +45,8 @@ lto_cgraph_replace_node (struct cgraph_node *node,
     {
       fprintf (cgraph_dump_file, "Replacing cgraph node %s/%i by %s/%i"
  	       " for symbol %s\n",
-	       cgraph_node_name (node), node->order,
-	       cgraph_node_name (prevailing_node),
+	       node->name (), node->order,
+	       prevailing_node->name (),
 	       prevailing_node->order,
 	       IDENTIFIER_POINTER ((*targetm.asm_out.mangle_assembler_name)
 		 (IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->decl)))));
@@ -428,7 +428,7 @@ lto_symtab_merge_decls_1 (symtab_node *first)
   if (cgraph_dump_file)
     {
       fprintf (cgraph_dump_file, "Merging nodes for %s. Candidates:\n",
-	       symtab_node_asm_name (first));
+	       first->asm_name ());
       for (e = first; e; e = e->next_sharing_asm_name)
 	if (TREE_PUBLIC (e->decl))
 	  dump_symtab_node (cgraph_dump_file, e);
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 62856d0..6ecac01 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -2480,7 +2480,7 @@ lto_wpa_write_files (void)
 	       lsei_next_in_partition (&lsei))
 	    {
 	      symtab_node *node = lsei_node (lsei);
-	      fprintf (cgraph_dump_file, "%s ", symtab_node_asm_name (node));
+	      fprintf (cgraph_dump_file, "%s ", node->asm_name ());
 	    }
 	  fprintf (cgraph_dump_file, "\n  Symbols in boundary: ");
 	  for (lsei = lsei_start (part->encoder); !lsei_end_p (lsei);
@@ -2489,7 +2489,7 @@ lto_wpa_write_files (void)
 	      symtab_node *node = lsei_node (lsei);
 	      if (!lto_symtab_encoder_in_partition_p (part->encoder, node))
 		{
-	          fprintf (cgraph_dump_file, "%s ", symtab_node_asm_name (node));
+	          fprintf (cgraph_dump_file, "%s ", node->asm_name ());
 		  cgraph_node *cnode = dyn_cast <cgraph_node> (node);
 		  if (cnode
 		      && lto_symtab_encoder_encode_body_p (part->encoder, cnode))