From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 2 Oct 2014 07:07:04 +0000 (+0000)
Subject: 	* cgraphclones.c (build_function_type_skip_args): Do not make new
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40e1cddf47a663c3b023bcfbd6dd69d41e277bdd;p=thirdparty%2Fgcc.git

	* cgraphclones.c (build_function_type_skip_args): Do not make new
	type variant of old.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215795 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e07c960ade66..860004054d41 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01  Jan Hubicka  <hubicka@ucw.cz>
+
+	* cgraphclones.c (build_function_type_skip_args): Do not make new
+	type variant of old. 
+
 2014-10-01  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-prop.h (ipa_get_controlled_uses): Add hack to avoid ICE
diff --git a/gcc/cgraphclones.c b/gcc/cgraphclones.c
index 38d92f53e836..37b234f78911 100644
--- a/gcc/cgraphclones.c
+++ b/gcc/cgraphclones.c
@@ -177,7 +177,7 @@ build_function_type_skip_args (tree orig_type, bitmap args_to_skip,
 			       bool skip_return)
 {
   tree new_type = NULL;
-  tree args, new_args = NULL, t;
+  tree args, new_args = NULL;
   tree new_reversed;
   int i = 0;
 
@@ -218,22 +218,6 @@ build_function_type_skip_args (tree orig_type, bitmap args_to_skip,
   if (skip_return)
     TREE_TYPE (new_type) = void_type_node;
 
-  /* This is a new type, not a copy of an old type.  Need to reassociate
-     variants.  We can handle everything except the main variant lazily.  */
-  t = TYPE_MAIN_VARIANT (orig_type);
-  if (t != orig_type)
-    {
-      t = build_function_type_skip_args (t, args_to_skip, skip_return);
-      TYPE_MAIN_VARIANT (new_type) = t;
-      TYPE_NEXT_VARIANT (new_type) = TYPE_NEXT_VARIANT (t);
-      TYPE_NEXT_VARIANT (t) = new_type;
-    }
-  else
-    {
-      TYPE_MAIN_VARIANT (new_type) = new_type;
-      TYPE_NEXT_VARIANT (new_type) = NULL;
-    }
-
   return new_type;
 }