summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/stor-layout.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc1d68e9094..817d483d38c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-03 Jason Merrill <jason@redhat.com>
+
+ * stor-layout.c (set_sizetype): Set TYPE_CANONICAL.
+
2009-04-03 Steve Ellcey <sje@cup.hp.com>
* config/ia64/ia64.md (extendsfdf2, extendsfxf2, extenddfxf2,
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 581cb89d3c6..e7036827a0c 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -2070,6 +2070,7 @@ set_sizetype (tree type)
/* Replace our original stub sizetype. */
memcpy (sizetype, t, tree_size (sizetype));
TYPE_MAIN_VARIANT (sizetype) = sizetype;
+ TYPE_CANONICAL (sizetype) = sizetype;
t = make_node (INTEGER_TYPE);
TYPE_NAME (t) = get_identifier ("bit_size_type");
@@ -2084,6 +2085,7 @@ set_sizetype (tree type)
/* Replace our original stub bitsizetype. */
memcpy (bitsizetype, t, tree_size (bitsizetype));
TYPE_MAIN_VARIANT (bitsizetype) = bitsizetype;
+ TYPE_CANONICAL (bitsizetype) = bitsizetype;
if (TYPE_UNSIGNED (type))
{