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

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

From-SVN: r215791

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3d65423077746cc89f07c5c13aeb265608a18bbc..354fa6aadc8dfd2c2dccda5bdf8b33711c86556a 100644 (file)
--- 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 34d4c0207d1a36e588eeb161c999fd75706ee665..8b0f582041f31450d5d46fbb351890a5854759f4 100644 (file)
--- 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;