gimple.c (gimple_register_canonical_type): Do not register any types via gimple_regis...

2011-05-31  Richard Guenther  <rguenther@suse.de>

	* gimple.c (gimple_register_canonical_type): Do not register
	any types via gimple_register_type.

From-SVN: r174483

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86a288a631d4b6469b74c4c842e502fb7ce913ce..84a375723843bab5d82c29e53d44ac973c48e34e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-31  Richard Guenther  <rguenther@suse.de>
+
+       * gimple.c (gimple_register_canonical_type): Do not register
+       any types via gimple_register_type.
+
 2011-05-31  Jan Hubicka  <jh@suse.cz>
 
        * lto-symtab.c (lto_symtab_merge_cgraph_nodes): Merge alias decl

diff --git a/gcc/gimple.c b/gcc/gimple.c
index 0cbd443337befbd920579f1a9bd3a893af8c9d75..6a9b58d602381433790ba2870e3001d768541581 100644 (file)
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -4749,18 +4749,9 @@ tree
 gimple_register_canonical_type (tree t)
 {
   void **slot;
-  tree orig_t = t;
 
   gcc_assert (TYPE_P (t));
 
-  if (TYPE_CANONICAL (t))
-    return TYPE_CANONICAL (t);
-
-  /* Use the leader of our main variant for determining our canonical
-     type.  The main variant leader is a type that will always
-     prevail.  */
-  t = gimple_register_type (TYPE_MAIN_VARIANT (t));
-
   if (TYPE_CANONICAL (t))
     return TYPE_CANONICAL (t);
 
@@ -4783,9 +4774,6 @@ gimple_register_canonical_type (tree t)
       *slot = (void *) t;
     }
 
-  /* Also cache the canonical type in the non-leaders.  */
-  TYPE_CANONICAL (orig_t) = t;
-
   return t;
 }