backport: Makefile.in (TREE_INLINE_H): New.

        Merge from gomp branch:
        * Makefile.in (TREE_INLINE_H): New.  Use it as needed.
        * tree-inline.h (struct copy_body_data): Move from tree-inline.c
        and rename from struct inline_data.  Rename callee* to dst*;
        caller* to src*; add copy_decl hook, transform_call_graph_edges,
        transform_new_cfg, transform_return_to_modify, and
        transform_lang_insert_block flags; remove cloning_p, versioning_p,
        update_clones_p.
        (copy_body_r, insert_decl_map, remap_decl, remap_type): Declare.
        (copy_decl_for_dup): Remove.
        * tree-inline.c (struct inline_data): Move to header.
        (insert_decl_map): Export.
        (remap_decl): Update for member name changes.  Use copy_decl hook.
        Allow for replacement to be a non-decl.  Remove dead code.
        (remap_type_1): Check for existing mapping.
        (remap_type): Export.
        (remap_decls): Update for member name changes.
        (remap_block, copy_bb, copy_cfg_body, copy_generic_body): Likewise.
        (copy_body, setup_one_parameter, declare_return_variable): Likewise.
        (expand_call_inline, optimize_inline_calls, clone_body): Likewise.
        (copy_tree_r, mark_local_for_remap_r, unsave_expr_now): Likewise.
        (tree_function_versioning, build_duplicate_type): Likewise.
        (copy_body_r): Likewise.  Export.
        (copy_decl_for_dup): Split into ...
        (copy_decl_for_dup_finish, copy_decl_to_var,
        copy_decl_no_change, copy_decl_maybe_to_var): ... these.
        (replace_ref_tree, inlining_p): Remove.

From-SVN: r109797

gcc/ChangeLog

+2006-01-16  Richard Henderson  <rth@redhat.com>
+
+	Merge from gomp branch:
+	* Makefile.in (TREE_INLINE_H): New.  Use it as needed.
+	* tree-inline.h (struct copy_body_data): Move from tree-inline.c
+	and rename from struct inline_data.  Rename callee* to dst*; 
+	caller* to src*; add copy_decl hook, transform_call_graph_edges,
+	transform_new_cfg, transform_return_to_modify, and
+	transform_lang_insert_block flags; remove cloning_p, versioning_p,
+	update_clones_p.
+	(copy_body_r, insert_decl_map, remap_decl, remap_type): Declare.
+	(copy_decl_for_dup): Remove.
+	* tree-inline.c (struct inline_data): Move to header.
+	(insert_decl_map): Export.
+	(remap_decl): Update for member name changes.  Use copy_decl hook.
+	Allow for replacement to be a non-decl.  Remove dead code.
+	(remap_type_1): Check for existing mapping.
+	(remap_type): Export.
+	(remap_decls): Update for member name changes.
+	(remap_block, copy_bb, copy_cfg_body, copy_generic_body): Likewise.
+	(copy_body, setup_one_parameter, declare_return_variable): Likewise.
+	(expand_call_inline, optimize_inline_calls, clone_body): Likewise.
+	(copy_tree_r, mark_local_for_remap_r, unsave_expr_now): Likewise.
+	(tree_function_versioning, build_duplicate_type): Likewise.
+	(copy_body_r): Likewise.  Export.
+	(copy_decl_for_dup): Split into ...
+	(copy_decl_for_dup_finish, copy_decl_to_var,
+	copy_decl_no_change, copy_decl_maybe_to_var): ... these.
+	(replace_ref_tree, inlining_p): Remove.
+
 2006-01-16  Kazu Hirata  <kazu@codesourcery.com>
 
 	* ifcvt.c (if_convert): Make it static.

gcc/tree-inline.h

@@ -23,8 +23,78 @@ Boston, MA 02110-1301, USA.  */
 #define GCC_TREE_INLINE_H
 
 #include "varray.h"
+#include "splay-tree.h"
+
+
+/* Data required for function body duplication.  */
+
+typedef struct copy_body_data
+{
+  /* FUNCTION_DECL for function being inlined, or in general the
+     source function providing the original trees.  */
+  tree src_fn;
+  /* FUNCTION_DECL for function being inlined into, or in general
+     the destination function receiving the new trees.  */
+  tree dst_fn;
+  /* Callgraph node of the source function.  */
+  struct cgraph_node *src_node;
+  /* Callgraph node of the destination function.  */
+  struct cgraph_node *dst_node;
+  /* struct function for function being inlined.  Usually this is the same
+     as DECL_STRUCT_FUNCTION (src_fn), but can be different if saved_cfg
+     and saved_eh are in use.  */
+  struct function *src_cfun;
+
+  /* The VAR_DECL for the return value.  */
+  tree retvar;
+  /* The map from local declarations in the inlined function to
+     equivalents in the function into which it is being inlined.  */
+  splay_tree decl_map;
+
+  /* Create a new decl to replace DECL in the destination function.  */
+  tree (*copy_decl) (tree, struct copy_body_data *);
+
+  /* Current BLOCK.  */
+  tree block;
+
+  /* Exception region the inlined call lie in.  */
+  int eh_region;
+  /* Take region number in the function being copied, add this value and
+     get eh region number of the duplicate in the function we inline into.  */
+  int eh_region_offset;
+
+  /* We use the same mechanism do all sorts of different things.  Rather
+     than enumerating the different cases, we categorize the behaviour
+     in the various situations.  */
+
+  /* Indicate the desired behaviour wrt call graph edges.  We can either
+     duplicate the edge (inlining, cloning), move the edge (versioning,
+     parallelization), or move the edges of the clones (saving).  */
+  enum copy_body_cge_which {
+    CB_CGE_DUPLICATE,
+    CB_CGE_MOVE,
+    CB_CGE_MOVE_CLONES
+  } transform_call_graph_edges;
+
+  /* True if a new CFG should be created.  False for inlining, true for
+     everything else.  */
+  bool transform_new_cfg;
+
+  /* True if RETURN_EXPRs should be transformed to just the contained
+     MODIFY_EXPR.  The branch semantics of the return will be handled
+     by manipulating the CFG rather than a statement.  */
+  bool transform_return_to_modify;
+
+  /* True if lang_hooks.decls.insert_block should be invoked when
+     duplicating BLOCK nodes.  */
+  bool transform_lang_insert_block;
+} copy_body_data;
+
 /* Function prototypes.  */
 
+extern tree copy_body_r (tree *, int *, void *);
+extern void insert_decl_map (copy_body_data *, tree, tree);
+
 void optimize_inline_calls (tree);
 bool tree_inlinable_function_p (tree);
 tree copy_tree_r (tree *, int *, void *);
@@ -37,9 +107,8 @@ int estimate_num_insns (tree expr);
 bool tree_versionable_function_p (tree);
 void tree_function_versioning (tree, tree, varray_type, bool);
 
-/* Copy a declaration when one function is substituted inline into
-   another.  It is used also for versioning.  */
-extern tree copy_decl_for_dup (tree, tree, tree, bool);
+extern tree remap_decl (tree decl, copy_body_data *id);
+extern tree remap_type (tree type, copy_body_data *id);
 
 /* 0 if we should not perform inlining.
    1 if we should expand functions calls inline at the tree level.