* tree.h (enum size_type_kind): Remove USIZETYPE, UBITSIZETYPE.

	(usize_type, ubitsizetype): Remove.
	* stor-layout.c (set_sizetype): Don't initialize usizetype,
	ubitsizetype.
	* fold-const.c (size_diffop): TYPE can never be ubitsizetype.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d700176..a673be7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2004-08-23  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * tree.h (enum size_type_kind): Remove USIZETYPE, UBITSIZETYPE.
+       (usize_type, ubitsizetype): Remove.
+       * stor-layout.c (set_sizetype): Don't initialize usizetype,
+       ubitsizetype.
+       * fold-const.c (size_diffop): TYPE can never be ubitsizetype.
+
        * tree.h (build_distinct_type_copy): New.
        (build_type_copy): ... here.  Rename to ...
        (build_variant_type_copy): ... here.

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 893aacc..25fa071 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -1728,8 +1728,7 @@ size_diffop (tree arg0, tree arg1)
   if (!TYPE_UNSIGNED (type))
     return size_binop (MINUS_EXPR, arg0, arg1);
 
-  ctype = (type == bitsizetype || type == ubitsizetype
-          ? sbitsizetype : ssizetype);
+  ctype = type == bitsizetype ? sbitsizetype : ssizetype;
 
   /* If either operand is not a constant, do the conversions to the signed
      type and subtract.  The hardware will do the right thing with any

diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 19de9b6..7f188f2 100644 (file)
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -1921,8 +1921,6 @@ set_sizetype (tree type)
 
   if (TYPE_UNSIGNED (type))
     {
-      usizetype = sizetype;
-      ubitsizetype = bitsizetype;
       ssizetype = copy_node (make_signed_type (oprecision));
       sbitsizetype = copy_node (make_signed_type (precision));
     }
@@ -1930,8 +1928,6 @@ set_sizetype (tree type)
     {
       ssizetype = sizetype;
       sbitsizetype = bitsizetype;
-      usizetype = copy_node (make_unsigned_type (oprecision));
-      ubitsizetype = copy_node (make_unsigned_type (precision));
     }
 
   TYPE_NAME (bitsizetype) = get_identifier ("bit_size_type");

diff --git a/gcc/tree.h b/gcc/tree.h
index 6e381a6..920abe7 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3077,10 +3077,8 @@ enum size_type_kind
 {
   SIZETYPE,            /* Normal representation of sizes in bytes.  */
   SSIZETYPE,           /* Signed representation of sizes in bytes.  */
-  USIZETYPE,           /* Unsigned representation of sizes in bytes.  */
   BITSIZETYPE,         /* Normal representation of sizes in bits.  */
   SBITSIZETYPE,                /* Signed representation of sizes in bits.  */
-  UBITSIZETYPE,                /* Unsigned representation of sizes in bits.  */
   TYPE_KIND_LAST};
 
 extern GTY(()) tree sizetype_tab[(int) TYPE_KIND_LAST];
@@ -3088,9 +3086,7 @@ extern GTY(()) tree sizetype_tab[(int) TYPE_KIND_LAST];
 #define sizetype sizetype_tab[(int) SIZETYPE]
 #define bitsizetype sizetype_tab[(int) BITSIZETYPE]
 #define ssizetype sizetype_tab[(int) SSIZETYPE]
-#define usizetype sizetype_tab[(int) USIZETYPE]
 #define sbitsizetype sizetype_tab[(int) SBITSIZETYPE]
-#define ubitsizetype sizetype_tab[(int) UBITSIZETYPE]
 
 extern tree size_binop (enum tree_code, tree, tree);
 extern tree size_diffop (tree, tree);