* tree.h (sizetype_tab[2], sbitsizetype, ubitsizetype): Merge all

of these into a single struct, with additional [us]sizetype entries.
* stor-layout.c (set_sizetype): Initialize [us]sizetype.
* fold-const.c (size_int_wide): Don't rely on sizetype_tab being
an array.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18994 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 2 deletions

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 648dc3b81b3..afdd26b679d 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1444,14 +1444,14 @@ size_int_wide (number, high, bit_p)
       /* Make this a permanent node.  */
       end_temporary_allocation ();
       t = build_int_2 (number, 0);
-      TREE_TYPE (t) = sizetype_tab[bit_p];
+      TREE_TYPE (t) = bit_p ? bitsizetype : sizetype;
       size_table[number][bit_p] = t;
       pop_obstacks ();
     }
   else
     {
       t = build_int_2 (number, high);
-      TREE_TYPE (t) = sizetype_tab[bit_p];
+      TREE_TYPE (t) = bit_p ? bitsizetype : sizetype;
       TREE_OVERFLOW (t) = TREE_CONSTANT_OVERFLOW (t) = force_fit_type (t, 0);
     }
   return t;