* lex.c (do_identifier): Remove unnecessary lookup of class field.

From-SVN: r28671

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6575c57780495414740cfe0faee8c39e82d3afaa..bc2d0d4ba3fe2414eb2f58cc31b23198f419a224 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-10  Martin v. Loewis  <martin@mira.isdn.cs.tu-berlin.de>
+
+       * lex.c (do_identifier): Remove unnecessary lookup of class field.
+
 1999-08-09  Martin v. Loewis  <martin@mira.isdn.cs.tu-berlin.de>
 
        * decl2.c (set_decl_namespace): Do not complain about non-matching

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 48a2d9889b3cad965ee45349b237c1d3822dbbd3..81ec12eecfd784034de1277dce2e799b2e2a3879 100644 (file)
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -3091,34 +3091,6 @@ do_identifier (token, parsing, args)
   else
     id = lastiddecl;
 
-  /* Scope class declarations before global
-     declarations.  */
-  if ((!id || is_global (id))
-      && current_class_type != 0
-      && TYPE_SIZE (current_class_type) == 0)
-    {
-      /* Could be from one of the base classes.  */
-      tree field = lookup_field (current_class_type, token, 1, 0);
-      if (field == 0)
-       ;
-      else if (field == error_mark_node)
-       /* We have already generated the error message.
-          But we still want to return this value.  */
-       id = lookup_field (current_class_type, token, 0, 0);
-      else if (TREE_CODE (field) == VAR_DECL
-              || TREE_CODE (field) == CONST_DECL
-              || TREE_CODE (field) == TEMPLATE_DECL)
-       id = field;
-      else if (TREE_CODE (field) != FIELD_DECL)
-       my_friendly_abort (61);
-      else
-       {
-         cp_error ("invalid use of member `%D'", field);
-         id = error_mark_node;
-         return id;
-       }
-    }
-
   /* Do Koenig lookup if appropriate (inside templates we build lookup
      expressions instead).  */
   if (args && !current_template_parms && (!id || is_global (id)))