aboutsummaryrefslogtreecommitdiff
path: root/gcc/cgraph.c
diff options
context:
space:
mode:
authorJan Hubicka <jh@suse.cz>2012-03-22 15:33:27 +0100
committerJan Hubicka <hubicka@gcc.gnu.org>2012-03-22 14:33:27 +0000
commitb4e93f4518eccf83c79145c0b74e6c72ce9bbc0f (patch)
tree03738d0312372fd214a53bbb313ffd06dbb04d03 /gcc/cgraph.c
parente45381b354ce6eac6cbcbf8a83f818c82ac52ac7 (diff)
downloadgcc-b4e93f4518eccf83c79145c0b74e6c72ce9bbc0f.zip
gcc-b4e93f4518eccf83c79145c0b74e6c72ce9bbc0f.tar.gz
gcc-b4e93f4518eccf83c79145c0b74e6c72ce9bbc0f.tar.bz2
re PR tree-optimization/51737 (g++ crashes (internal compiler error: Segmentation fault) when compiling quickbook)
PR middle-end/51737 * cgraph.c (cgraph_remove_node_and_inline_clones): Add FORBIDDEN_NODE parameter. * cgraph.h (cgraph_remove_node_and_inline_clones): Update prototype. * ipa-inline-transform.c (save_inline_function_body): Remove copied clone if needed. * tree-inline.c (delete_unreachable_blocks_update_callgraph): Update. PR middle-end/51737 * g++.dg/torture/pr51737.C: New testcase From-SVN: r185694
Diffstat (limited to 'gcc/cgraph.c')
-rw-r--r--gcc/cgraph.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/gcc/cgraph.c b/gcc/cgraph.c
index 9cc3690..7c44c05 100644
--- a/gcc/cgraph.c
+++ b/gcc/cgraph.c
@@ -1639,19 +1639,27 @@ cgraph_add_to_same_comdat_group (struct cgraph_node *new_,
}
}
-/* Remove the node from cgraph. */
+/* Remove the node from cgraph and all inline clones inlined into it.
+ Skip however removal of FORBIDDEN_NODE and return true if it needs to be
+ removed. This allows to call the function from outer loop walking clone
+ tree. */
-void
-cgraph_remove_node_and_inline_clones (struct cgraph_node *node)
+bool
+cgraph_remove_node_and_inline_clones (struct cgraph_node *node, struct cgraph_node *forbidden_node)
{
struct cgraph_edge *e, *next;
+ bool found = false;
+
+ if (node == forbidden_node)
+ return true;
for (e = node->callees; e; e = next)
{
next = e->next_callee;
if (!e->inline_failed)
- cgraph_remove_node_and_inline_clones (e->callee);
+ found |= cgraph_remove_node_and_inline_clones (e->callee, forbidden_node);
}
cgraph_remove_node (node);
+ return found;
}
/* Notify finalize_compilation_unit that given node is reachable. */