* stor-layout.c (set_sizetype): Use TYPE_ORIG_SIZE_TYPE.

From-SVN: r79642

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6c327c9674fc82b7b9777e942d709142883a9f2..5b480832822f411ef21722ad09b50a2c856744ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -13,13 +13,13 @@
        * c-typeck.c (build_array_ref): Use TYPE_DOMAIN, not TYPE_VALUES.
        * dwarf2out.c (gen_enumeration_type_die): Use TYPE_VALUES,
        not TYPE_FIELDS.
+       * stor-layout.c (set_sizetype): Use TYPE_ORIG_SIZE_TYPE.
 
 2004-03-18  Mostafa Hagog  <mustafa@il.ibm.com>
 
        * gcse.c (eliminate_partially_redundant_loads): Reject change if
        dest is set between beginning and current insn.
 
->>>>>>> 2.3204
 2004-03-18  Mark Mitchell  <mark@codesourcery.com>
 
        * c-decl.c (grokdeclarator): Do not complain about redeclaring

diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 792349291718f9dd2e2c05cfddcfcc34bff25f81..fa26bd7e31b97fd5532706497fe03996ff225aa2 100644 (file)
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1888,7 +1888,7 @@ set_sizetype (tree type)
 
   /* Make copies of nodes since we'll be setting TYPE_IS_SIZETYPE.  */
   sizetype = copy_node (type);
-  TYPE_DOMAIN (sizetype) = type;
+  TYPE_ORIG_SIZE_TYPE (sizetype) = type;
   TYPE_IS_SIZETYPE (sizetype) = 1;
   bitsizetype = make_node (INTEGER_TYPE);
   TYPE_NAME (bitsizetype) = TYPE_NAME (type);