summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>2010-04-21 14:38:38 +0000
committerhubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>2010-04-21 14:38:38 +0000
commit6d61f3f99adeb3765e55ba00a34bb6e66496995b (patch)
treeb5916b7801f70ee6e1700cfd3a21c5b1f2bbfee7
parentf247be1065405b6b37633e1f981b6e14034ddc97 (diff)
downloadgcc-6d61f3f99adeb3765e55ba00a34bb6e66496995b.tar.gz
* cgraph.c (dump_cgraph_node): Dump also assembler name.
* ipa-inline.c (cgraph_decide_inlining_of_small_functions): Do not ice at WPA dumping. (cgraph_decide_inlining): Do not expect callee to be removed in all cases. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158607 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/cgraph.c2
-rw-r--r--gcc/ipa-inline.c15
3 files changed, 19 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac8977fd45d..2209030fb72 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-21 Jan Hubicka <jh@suse.cz>
+
+ * cgraph.c (dump_cgraph_node): Dump also assembler name.
+ * ipa-inline.c (cgraph_decide_inlining_of_small_functions): Do not ice
+ at WPA dumping.
+ (cgraph_decide_inlining): Do not expect callee to be removed in all
+ cases.
+
2010-04-21 Eric B. Weddington <eric.weddington@atmel.com>
* config/avr/avr-devices.c (avr_mcu_types): Add missing comma.
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 682c3fb5305..c5e0f3d940c 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -1629,6 +1629,8 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node)
fprintf (f, "%s/%i(%i)", cgraph_node_name (node), node->uid,
node->pid);
dump_addr (f, " @", (void *)node);
+ if (DECL_ASSEMBLER_NAME_SET_P (node->decl))
+ fprintf (f, " (asm: %s)", IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (node->decl)));
if (node->global.inlined_to)
fprintf (f, " (inline copy in %s/%i)",
cgraph_node_name (node->global.inlined_to),
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 751966cefb2..8957990cae4 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1024,8 +1024,9 @@ cgraph_decide_inlining_of_small_functions (void)
" Estimated growth after inlined into all callees is %+i insns.\n"
" Estimated badness is %i, frequency %.2f.\n",
cgraph_node_name (edge->caller),
- gimple_filename ((const_gimple) edge->call_stmt),
- gimple_lineno ((const_gimple) edge->call_stmt),
+ flag_wpa ? "unknown"
+ : gimple_filename ((const_gimple) edge->call_stmt),
+ flag_wpa ? -1 : gimple_lineno ((const_gimple) edge->call_stmt),
cgraph_estimate_growth (edge->callee),
badness,
edge->frequency / (double)CGRAPH_FREQ_BASE);
@@ -1200,8 +1201,9 @@ cgraph_decide_inlining_of_small_functions (void)
" Estimated growth after inlined into all callees is %+i insns.\n"
" Estimated badness is %i, frequency %.2f.\n",
cgraph_node_name (edge->caller),
- gimple_filename ((const_gimple) edge->call_stmt),
- gimple_lineno ((const_gimple) edge->call_stmt),
+ flag_wpa ? "unknown"
+ : gimple_filename ((const_gimple) edge->call_stmt),
+ flag_wpa ? -1 : gimple_lineno ((const_gimple) edge->call_stmt),
cgraph_estimate_growth (edge->callee),
badness,
edge->frequency / (double)CGRAPH_FREQ_BASE);
@@ -1416,13 +1418,14 @@ cgraph_decide_inlining (void)
if (cgraph_check_inline_limits (node->callers->caller, node,
&reason, false))
{
+ struct cgraph_node *caller = node->callers->caller;
cgraph_mark_inline (node->callers);
if (dump_file)
fprintf (dump_file,
" Inlined into %s which now has %i size"
" for a net change of %+i size.\n",
- cgraph_node_name (node->callers->caller),
- node->callers->caller->global.size,
+ cgraph_node_name (caller),
+ caller->global.size,
overall_size - old_size);
}
else