* c-lex.c (c_lex): Just cast cpp's hashnode to gcc's one.

	* stringpool.c:	(IS_FE_IDENT, make_identifier): Delete.
	(maybe_get_identifier): Update.
	* tree.h (make_identifier): Delete.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e578ae..1442a19 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-22  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * c-lex.c (c_lex): Just cast cpp's hashnode to gcc's one.
+       * stringpool.c: (IS_FE_IDENT, make_identifier): Delete.
+       (maybe_get_identifier): Update.
+       * tree.h (make_identifier): Delete.
+
 2001-05-21  Richard Henderson  <rth@redhat.com>
 
        * combine.c (subst): Do not substitute for a register as

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index bb09b88..914da81 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -997,12 +997,7 @@ c_lex (value)
       goto retry;
       
     case CPP_NAME:
-      {
-       tree node = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok.val.node));
-       if (TREE_CODE (node) != IDENTIFIER_NODE)
-         make_identifier (node);
-       *value = node;
-      }
+      *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok.val.node));
       break;
 
     case CPP_INT:

diff --git a/gcc/stringpool.c b/gcc/stringpool.c
index 0828bc0..7abca36 100644 (file)
--- a/gcc/stringpool.c
+++ b/gcc/stringpool.c
@@ -35,8 +35,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "flags.h"
 #include "toplev.h"
 
-#define IS_FE_IDENT(NODE) (TREE_CODE (NODE) == IDENTIFIER_NODE)
-
 /* The "" allocated string.  */
 const char empty_string[] = "";
 
@@ -99,23 +97,6 @@ ggc_alloc_string (contents, length)
   return obstack_finish (&string_stack);
 }
 
-/* NODE is an identifier known to the preprocessor.  Make it known to
-   the front ends as well.  */
-
-void
-make_identifier (node)
-     tree node;
-{
-  /* If this identifier is longer than the clash-warning length,
-     do a brute force search of the entire table for clashes.  */
-  if (warn_id_clash && do_identifier_warnings
-      && IDENTIFIER_LENGTH (node) >= id_clash_len)
-    ht_forall (ident_hash, (ht_cb) scan_for_clashes,
-              IDENTIFIER_POINTER (node));
-
-  TREE_SET_CODE (node, IDENTIFIER_NODE);
-}
-
 /* Return an IDENTIFIER_NODE whose name is TEXT (a null-terminated string).
    If an identifier with that name has previously been referred to,
    the same node is returned this time.  */
@@ -141,17 +122,11 @@ maybe_get_identifier (text)
      const char *text;
 {
   hashnode ht_node;
-  tree node;
-  size_t length = strlen (text);
 
   ht_node = ht_lookup (ident_hash, (const unsigned char *) text,
-                      length, HT_NO_INSERT);
+                      strlen (text), HT_NO_INSERT);
   if (ht_node)
-    {
-      node = HT_IDENT_TO_GCC_IDENT (ht_node);
-      if (IS_FE_IDENT (node))
-       return node;
-    }
+    return HT_IDENT_TO_GCC_IDENT (ht_node);
 
   return NULL_TREE;
 }
@@ -167,8 +142,7 @@ scan_for_clashes (pfile, h, text)
 {
   tree node = HT_IDENT_TO_GCC_IDENT (h);
 
-  if (IS_FE_IDENT (node)
-      && IDENTIFIER_LENGTH (node) >= id_clash_len
+  if (IDENTIFIER_LENGTH (node) >= id_clash_len
       && !memcmp (IDENTIFIER_POINTER (node), text, id_clash_len))
     {
       warning ("\"%s\" and \"%s\" identical in first %d characters",

diff --git a/gcc/tree.h b/gcc/tree.h
index 622eed3..bea25d0 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1958,10 +1958,6 @@ extern tree make_tree_vec                PARAMS ((int));
 
 extern tree get_identifier             PARAMS ((const char *));
 
-/* NODE is an identifier known to the preprocessor.  Make it known to
-   the front ends as well.  */
-extern void make_identifier            PARAMS ((tree node));
-
 /* If an identifier with the name TEXT (a null-terminated string) has
    previously been referred to, return that node; otherwise return
    NULL_TREE.  */