aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2011-05-31 14:24:22 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2011-05-31 14:24:22 +0000
commit2611db71ea2dda0b3c5fb32b2fc5778779a57fda (patch)
tree6735871144b091e9a8fdf8cfd6d3976674fb40d4
parentb9e57365defa41307c888e8eabdff8099ab68887 (diff)
downloadgcc-2611db71ea2dda0b3c5fb32b2fc5778779a57fda.zip
gcc-2611db71ea2dda0b3c5fb32b2fc5778779a57fda.tar.gz
gcc-2611db71ea2dda0b3c5fb32b2fc5778779a57fda.tar.bz2
gimple.c (gimple_register_canonical_type): Do not register any types via gimple_register_type.
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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/gimple.c12
2 files changed, 5 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86a288a..84a3757 100644
--- 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 0cbd443..6a9b58d6 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -4749,21 +4749,12 @@ 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);
-
if (gimple_canonical_types == NULL)
gimple_canonical_types = htab_create_ggc (16381, gimple_canonical_type_hash,
gimple_canonical_type_eq, 0);
@@ -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;
}