From: Martin Liska <mliska@suse.cz>
Date: Wed, 8 Jan 2020 11:58:49 +0000 (+0100)
Subject: Replace node->name/node->order with node->dump_name.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d597b9445f0fddae407914e1497e3422e46ed15d;p=gcc.git

Replace node->name/node->order with node->dump_name.

2020-01-08  Martin Liska  <mliska@suse.cz>

	* ipa-fnsummary.c (dump_ipa_call_summary): Use symtab_node::dump_name.
	(ipa_call_context::estimate_size_and_time): Likewise.
	(inline_analyze_function): Likewise.
2020-01-08  Martin Liska  <mliska@suse.cz>

	* lto-partition.c (lto_balanced_map): Use symtab_node::dump_name.

From-SVN: r279999
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f8f4c704499..f7f7402a7d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-08  Martin Liska  <mliska@suse.cz>
+
+	* ipa-fnsummary.c (dump_ipa_call_summary): Use symtab_node::dump_name.
+	(ipa_call_context::estimate_size_and_time): Likewise.
+	(inline_analyze_function): Likewise.
+
 2020-01-08  Martin Liska  <mliska@suse.cz>
 
 	* cgraph.c (cgraph_node::dump): Use systematically
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index fa01cb6c083..7c0b6f98e25 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -907,8 +907,8 @@ dump_ipa_call_summary (FILE *f, int indent, struct cgraph_node *node,
       int i;
 
       fprintf (f,
-	       "%*s%s/%i %s\n%*s  freq:%4.2f",
-	       indent, "", callee->name (), callee->order,
+	       "%*s%s %s\n%*s  freq:%4.2f",
+	       indent, "", callee->dump_name (),
 	       !edge->inline_failed
 	       ? "inlined" : cgraph_inline_failed_string (edge-> inline_failed),
 	       indent, "", edge->sreal_frequency ().to_double ());
@@ -3505,9 +3505,8 @@ ipa_call_context::estimate_size_and_time (int *ret_size,
   if (dump_file && (dump_flags & TDF_DETAILS))
     {
       bool found = false;
-      fprintf (dump_file, "   Estimating body: %s/%i\n"
-	       "   Known to be false: ", m_node->name (),
-	       m_node->order);
+      fprintf (dump_file, "   Estimating body: %s\n"
+	       "   Known to be false: ", m_node->dump_name ());
 
       for (i = predicate::not_inlined_condition;
 	   i < (predicate::first_dynamic_condition
@@ -4034,8 +4033,7 @@ inline_analyze_function (struct cgraph_node *node)
   push_cfun (DECL_STRUCT_FUNCTION (node->decl));
 
   if (dump_file)
-    fprintf (dump_file, "\nAnalyzing function: %s/%u\n",
-	     node->name (), node->order);
+    fprintf (dump_file, "\nAnalyzing function: %s\n", node->dump_name ());
   if (opt_for_fn (node->decl, optimize) && !node->thunk.thunk_p)
     inline_indirect_intraprocedural_analysis (node);
   compute_fn_summary (node, false);
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 74dea4beb58..233ac37cd78 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-08  Martin Liska  <mliska@suse.cz>
+
+	* lto-partition.c (lto_balanced_map): Use symtab_node::dump_name.
+
 2020-01-01  Jakub Jelinek  <jakub@redhat.com>
 
 	Update copyright years.
diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 86b2eabe374..5b153c9759e 100644
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -734,10 +734,10 @@ lto_balanced_map (int n_lto_partitions, int max_partition_size)
 	  best_varpool_pos = varpool_pos;
 	}
       if (dump_file)
-	fprintf (dump_file, "Step %i: added %s/%i, size %i, "
+	fprintf (dump_file, "Step %i: added %s, size %i, "
 		 "cost %" PRId64 "/%" PRId64 " "
 		 "best %" PRId64 "/%" PRId64", step %i\n", i,
-		 order[i]->name (), order[i]->order,
+		 order[i]->dump_name (),
 		 partition->insns, cost, internal,
 		 best_cost, best_internal, best_i);
       /* Partition is too large, unwind into step when best cost was reached and