+2010-05-26 Jan Hubicka <jh@suse.cz>
+
+ * cgraphunit.c (verify_cgraph_node): Do checking that DECL match
+ edge only when checking is enabled; check using former_clone_of;
+ check inline clones too.
+ (cgraph_materialize_clone): Record former_clone_of pointer.
+ (cgraph_redirect_edge_call_stmt_to_callee): Assert that we are not
+ combining redirections; dump args_to_skip bitmap
+ (cgraph_materialize_all_clones): Do no redirection here.
+ * ipa-inline.c (inline_transform): Do redirection here.
+ * cgraph.h (struct cgraph_node): Add former_clone_of filed (enabled
+ cheking only).
+
2010-05-26 Steven Bosscher <steven@gcc.gnu.org>
* config/avr/avr-c.c: Do not include regs.h.
debug_tree (e->callee->decl);
error_found = true;
}
- else if (!node->global.inlined_to
- && !e->callee->global.inlined_to
+#ifdef ENABLE_CHECKING
+ else if (!e->callee->global.inlined_to
&& decl
+ && cgraph_get_node (decl)
+ && (e->callee->former_clone_of
+ != cgraph_get_node (decl)->decl)
&& !clone_of_p (cgraph_node (decl),
e->callee))
{
debug_tree (decl);
error_found = true;
}
+#endif
}
else if (decl)
{
cgraph_materialize_clone (struct cgraph_node *node)
{
bitmap_obstack_initialize (NULL);
+#ifdef ENABLE_CHECKING
+ node->former_clone_of = node->clone_of->decl;
+ if (node->clone_of->former_clone_of)
+ node->former_clone_of = node->clone_of->former_clone_of;
+#endif
/* Copy the OLD_VERSION_NODE function tree to the new version. */
tree_function_versioning (node->clone_of->decl, node->decl,
node->clone.tree_map, true,
|| cgraph_get_node (decl) == cgraph_get_node (e->callee->decl))
return e->call_stmt;
+ gcc_assert (!cgraph_node (decl)->clone.combined_args_to_skip);
+
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "updating call of %s/%i -> %s/%i: ",
cgraph_node_name (e->caller), e->caller->uid,
cgraph_node_name (e->callee), e->callee->uid);
print_gimple_stmt (cgraph_dump_file, e->call_stmt, 0, dump_flags);
+ if (e->callee->clone.combined_args_to_skip)
+ {
+ fprintf (cgraph_dump_file, " combined args to skip: ");
+ dump_bitmap (cgraph_dump_file, e->callee->clone.combined_args_to_skip);
+ }
}
if (e->callee->clone.combined_args_to_skip)
if (!node->analyzed && node->callees)
cgraph_node_remove_callees (node);
if (cgraph_dump_file)
- fprintf (cgraph_dump_file, "Updating call sites\n");
- for (node = cgraph_nodes; node; node = node->next)
- if (node->analyzed && !node->clone_of
- && gimple_has_body_p (node->decl))
- {
- struct cgraph_edge *e;
-
- current_function_decl = node->decl;
- push_cfun (DECL_STRUCT_FUNCTION (node->decl));
- for (e = node->callees; e; e = e->next_callee)
- cgraph_redirect_edge_call_stmt_to_callee (e);
- gcc_assert (!need_ssa_update_p (cfun));
- pop_cfun ();
- current_function_decl = NULL;
-#ifdef ENABLE_CHECKING
- verify_cgraph_node (node);
-#endif
- }
- if (cgraph_dump_file)
fprintf (cgraph_dump_file, "Materialization Call site updates done.\n");
- /* All changes to parameters have been performed. In order not to
- incorrectly repeat them, we simply dispose of the bitmaps that drive the
- changes. */
- for (node = cgraph_nodes; node; node = node->next)
- node->clone.combined_args_to_skip = NULL;
#ifdef ENABLE_CHECKING
verify_cgraph ();
#endif