hashtable.c (calc_hash): Fix HASHSTEP definition.

	* hashtable.c (calc_hash): Fix HASHSTEP definition.
	* stringpool.c (make_identifier): No statistics here anymore.
	* objc-act.c (steup_string_decl): Remove redundant check.

From-SVN: r42337

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a740a65c60b006989379efb8759fc08c5bc036d6..8d5c4f835c2bbc0e10ed48e47a59d83a3fea5d6a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-20  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * hashtable.c (calc_hash): Fix HASHSTEP definition.
+       * stringpool.c (make_identifier): No statistics here anymore.
+       * objc-act.c (steup_string_decl): Remove redundant check.
+
 2001-05-20  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * Makefile.in (OBJS, LIBCPP_OBJS, LIBCPP_DEPS,

diff --git a/gcc/hashtable.c b/gcc/hashtable.c
index f77eb7f132e20b1da33e4b9ad4f34d76360083c5..82c3a9e51ae7f6282d632f66693c16bcad1d4248 100644 (file)
--- a/gcc/hashtable.c
+++ b/gcc/hashtable.c
@@ -64,7 +64,7 @@ calc_hash (str, len)
 {
   unsigned int n = len;
   unsigned int r = 0;
-#define HASHSTEP(r, c) ((r) * 67 + (c - 113));
+#define HASHSTEP(r, c) ((r) * 67 + ((c) - 113));
 
   while (n--)
     r = HASHSTEP (r, *str++);

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 81e16191120b95009092568c56b59deb2395feea..27c4fd74851b97dbf88070ebc3ad429a53159e93 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -1267,12 +1267,7 @@ setup_string_decl ()
   if (!string_class_decl)
     {
       if (!constant_string_global_id)
-       {
-         constant_string_global_id =
-           get_identifier (STRING_OBJECT_GLOBAL_NAME);
-         if (constant_string_global_id == NULL_TREE)
-           return;
-        }
+       constant_string_global_id = get_identifier (STRING_OBJECT_GLOBAL_NAME);
       string_class_decl = lookup_name (constant_string_global_id);
     }
 }

diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index 6d440056d508a9f43f0c7ae440833b30cdb78433..0828bc0435ef9cd366d947875792b43bac4a0271 100644 (file)
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -114,9 +114,6 @@ make_identifier (node)
               IDENTIFIER_POINTER (node));
 
   TREE_SET_CODE (node, IDENTIFIER_NODE);
-#ifdef GATHER_STATISTICS
-  id_string_size += IDENTIFIER_LENGTH (node);
-#endif
 }
 
 /* Return an IDENTIFIER_NODE whose name is TEXT (a null-terminated string).