backport: ChangeLog.tuples: ChangeLog from gimple-tuples-branch.

[gcc.git] / gcc / tree-inline.h

diff --git a/gcc/tree-inline.h b/gcc/tree-inline.h
index ab03f7a20ad20657bada2671295dcdb8d6e7a628..e590e1465a7a2b1a3b4e6426ed82915db7d0de0c 100644 (file)
--- a/gcc/tree-inline.h
+++ b/gcc/tree-inline.h
@@ -32,13 +32,17 @@ 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.  */
@@ -46,6 +50,7 @@ typedef struct copy_body_data
 
   /* 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.  */
   struct pointer_map_t *decl_map;
@@ -56,12 +61,13 @@ typedef struct copy_body_data
   /* Current BLOCK.  */
   tree block;
 
-  /* CALL_EXPR if va arg parameter packs should be expanded or NULL
+  /* GIMPLE_CALL if va arg parameter packs should be expanded or NULL
      is not.  */
-  tree call_expr;
+  gimple gimple_call;
 
   /* 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;
@@ -137,23 +143,26 @@ extern eni_weights eni_time_weights;
 
 /* Function prototypes.  */
 
-extern tree copy_body_r (tree *, int *, void *);
+extern tree copy_tree_body_r (tree *, int *, void *);
 extern void insert_decl_map (copy_body_data *, tree, tree);
 
 unsigned int optimize_inline_calls (tree);
 bool tree_inlinable_function_p (tree);
 tree copy_tree_r (tree *, int *, void *);
-tree copy_generic_body (copy_body_data *id);
 tree copy_decl_no_change (tree decl, copy_body_data *id);
 void save_body (tree, tree *, tree *);
 int estimate_move_cost (tree type);
-int estimate_num_insns (tree expr, eni_weights *);
+int estimate_num_insns (gimple, eni_weights *);
+int estimate_num_insns_fn (tree, eni_weights *);
+int count_insns_seq (gimple_seq, eni_weights *);
 bool tree_versionable_function_p (tree);
 void tree_function_versioning (tree, tree, varray_type, bool);
 bool tree_can_inline_p (tree, tree);
 
+extern gimple_seq remap_gimple_seq (gimple_seq, copy_body_data *);
 extern tree remap_decl (tree decl, copy_body_data *id);
 extern tree remap_type (tree type, copy_body_data *id);
+extern gimple_seq copy_gimple_seq_and_replace_locals (gimple_seq seq);
 
 extern HOST_WIDE_INT estimated_stack_frame_size (void);