1 files changed, 4 insertions, 99 deletions

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 9e041ca..4f15e57 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1922,7 +1922,7 @@ remap_gimple_stmt (gimple *stmt, copy_body_data *id)
   if (id->param_body_adjs)
     {
       gimple_seq extra_stmts = NULL;
-      id->param_body_adjs->modify_gimple_stmt (&copy, &extra_stmts);
+      id->param_body_adjs->modify_gimple_stmt (&copy, &extra_stmts, stmt);
       if (!gimple_seq_empty_p (extra_stmts))
 	{
 	  memset (&wi, 0, sizeof (wi));
@@ -4730,7 +4730,6 @@ expand_call_inline (basic_block bb, gimple *stmt, copy_body_data *id,
   use_operand_p use;
   gimple *simtenter_stmt = NULL;
   vec<tree> *simtvars_save;
-  clone_info *info;
 
   /* The gimplifier uses input_location in too many places, such as
      internal_get_tmp_var ().  */
@@ -5055,40 +5054,6 @@ expand_call_inline (basic_block bb, gimple *stmt, copy_body_data *id,
   /* Add local vars in this inlined callee to caller.  */
   add_local_variables (id->src_cfun, cfun, id);
 
-  info = clone_info::get (id->src_node);
-  if (info && info->performed_splits)
-    {
-      clone_info *dst_info = clone_info::get_create (id->dst_node);
-      /* Any calls from the inlined function will be turned into calls from the
-	 function we inline into.  We must preserve notes about how to split
-	 parameters such calls should be redirected/updated.  */
-      unsigned len = vec_safe_length (info->performed_splits);
-      for (unsigned i = 0; i < len; i++)
-	{
-	  ipa_param_performed_split ps
-	    = (*info->performed_splits)[i];
-	  ps.dummy_decl = remap_decl (ps.dummy_decl, id);
-	  vec_safe_push (dst_info->performed_splits, ps);
-	}
-
-      if (flag_checking)
-	{
-	  len = vec_safe_length (dst_info->performed_splits);
-	  for (unsigned i = 0; i < len; i++)
-	    {
-	      ipa_param_performed_split *ps1
-		= &(*dst_info->performed_splits)[i];
-	      for (unsigned j = i + 1; j < len; j++)
-		{
-		  ipa_param_performed_split *ps2
-		    = &(*dst_info->performed_splits)[j];
-		  gcc_assert (ps1->dummy_decl != ps2->dummy_decl
-			      || ps1->unit_offset != ps2->unit_offset);
-		}
-	    }
-	}
-    }
-
   if (dump_enabled_p ())
     {
       char buf[128];
@@ -6112,23 +6077,10 @@ tree_versionable_function_p (tree fndecl)
 static void
 update_clone_info (copy_body_data * id)
 {
-  clone_info *dst_info = clone_info::get (id->dst_node);
-  vec<ipa_param_performed_split, va_gc> *cur_performed_splits
-    = dst_info ? dst_info->performed_splits : NULL;
-  if (cur_performed_splits)
-    {
-      unsigned len = cur_performed_splits->length ();
-      for (unsigned i = 0; i < len; i++)
-	{
-	  ipa_param_performed_split *ps = &(*cur_performed_splits)[i];
-	  ps->dummy_decl = remap_decl (ps->dummy_decl, id);
-	}
-    }
-
-  struct cgraph_node *node;
-  if (!id->dst_node->clones)
+  struct cgraph_node *this_node = id->dst_node;
+  if (!this_node->clones)
     return;
-  for (node = id->dst_node->clones; node != id->dst_node;)
+  for (cgraph_node *node = this_node->clones; node != this_node;)
     {
       /* First update replace maps to match the new body.  */
       clone_info *info = clone_info::get (node);
@@ -6142,53 +6094,6 @@ update_clone_info (copy_body_data * id)
 	      walk_tree (&replace_info->new_tree, copy_tree_body_r, id, NULL);
 	    }
 	}
-      if (info && info->performed_splits)
-	{
-	  unsigned len = vec_safe_length (info->performed_splits);
-	  for (unsigned i = 0; i < len; i++)
-	    {
-	      ipa_param_performed_split *ps
-		= &(*info->performed_splits)[i];
-	      ps->dummy_decl = remap_decl (ps->dummy_decl, id);
-	    }
-	}
-      if (unsigned len = vec_safe_length (cur_performed_splits))
-	{
-	  /* We do not want to add current performed splits when we are saving
-	     a copy of function body for later during inlining, that would just
-	     duplicate all entries.  So let's have a look whether anything
-	     referring to the first dummy_decl is present.  */
-	  if (!info)
-	    info = clone_info::get_create (node);
-	  unsigned dst_len = vec_safe_length (info->performed_splits);
-	  ipa_param_performed_split *first = &(*cur_performed_splits)[0];
-	  for (unsigned i = 0; i < dst_len; i++)
-	    if ((*info->performed_splits)[i].dummy_decl
-		== first->dummy_decl)
-	      {
-		len = 0;
-		break;
-	      }
-
-	  for (unsigned i = 0; i < len; i++)
-	    vec_safe_push (info->performed_splits,
-			   (*cur_performed_splits)[i]);
-	  if (flag_checking)
-	    {
-	      for (unsigned i = 0; i < dst_len; i++)
-		{
-		  ipa_param_performed_split *ps1
-		    = &(*info->performed_splits)[i];
-		  for (unsigned j = i + 1; j < dst_len; j++)
-		    {
-		      ipa_param_performed_split *ps2
-			= &(*info->performed_splits)[j];
-		      gcc_assert (ps1->dummy_decl != ps2->dummy_decl
-				  || ps1->unit_offset != ps2->unit_offset);
-		    }
-		}
-	    }
-	}
 
       if (node->clones)
 	node = node->clones;