search.c (lookup_field): Return a NULL_TREE if XBASETYPE is itself null.

        * search.c (lookup_field): Return a NULL_TREE if XBASETYPE is
        itself null.

From-SVN: r8143

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2515e5ca2bd779057fed72c0585bb840bdc5f1e4..286c8ccb29b5b6eec710048509fa6360b447040d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 27 10:18:57 1994  Brendan Kehoe  (brendan@lisa.cygnus.com)
+
+       * search.c (lookup_field): Return a NULL_TREE if XBASETYPE is
+       itself null.
+
 Wed Sep 14 10:17:27 1994  Michael I Bushnell  <mib@churchy.gnu.ai.mit.edu>
 
        * g++.c: Include <sys/errno.h> in case `errno' is a macro

diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 6623ab4214a5a4844565769629e90141cf56e7c3..bd4f043711fc53e21233d56eb82943f6062d223e 100644 (file)
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1031,6 +1031,10 @@ lookup_field (xbasetype, name, protect, want_type)
      accurate error messages for access control.  */
   int index = MEMOIZED_HASH_FN (name);
 
+  /* We sometimes go looking with XBASETYPE pre-set to null.  */
+  if (xbasetype == NULL_TREE)
+    return NULL_TREE;
+
   /* If we are looking for a constructor in a templated type, use the
      unspecialized name, as that is how we store it.  */
   if (IDENTIFIER_TEMPLATE (name))