From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 2 Oct 2014 05:34:21 +0000 (+0000)
Subject: 	* ipa-prop.c (ipa_modify_formal_parameters): Do not merge
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90f9e6d2795462c886161bca9c47c9544e07833c;p=thirdparty%2Fgcc.git

	* ipa-prop.c (ipa_modify_formal_parameters): Do not merge
	type variants.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d6542307774..354fa6aadc8d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-01  Jan HUbicka  <hubicka@ucw.cz>
+
+	* ipa-prop.c (ipa_modify_formal_parameters): Do not merge
+	type variants.
+
 2014-10-01  Jan HUbicka  <hubicka@ucw.cz>
 
 	* ipa-polymorphic-call.c
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index 34d4c0207d1a..8b0f582041f3 100644
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -3960,21 +3960,6 @@ ipa_modify_formal_parameters (tree fndecl, ipa_parm_adjustment_vec adjustments)
       DECL_FUNCTION_CODE (fndecl) = (enum built_in_function) 0;
     }
 
-  /* 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.  */
-  tree t = TYPE_MAIN_VARIANT (orig_type);
-  if (orig_type != t)
-    {
-      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;
-    }
-
   TREE_TYPE (fndecl) = new_type;
   DECL_VIRTUAL_P (fndecl) = 0;
   DECL_LANG_SPECIFIC (fndecl) = NULL;