From: Neil Booth <neil@daikokuya.demon.co.uk>
Date: Sun, 20 May 2001 08:13:32 +0000 (+0000)
Subject: hashtable.c (calc_hash): Fix HASHSTEP definition.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a078edf8139869ae6833c7e5d5e832d3c656dacc;p=gcc.git

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 a740a65c60b..8d5c4f835c2 100644
--- 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 f77eb7f132e..82c3a9e51ae 100644
--- 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 81e16191120..27c4fd74851 100644
--- 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 6d440056d50..0828bc0435e 100644
--- 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).