From: Jason Merrill <jason@redhat.com>
Date: Sun, 17 Mar 2013 02:37:33 +0000 (-0400)
Subject: * search.c (lookup_base): Handle NULL_TREE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca2e264dd6e2eb677baebf6ebdad9d5f5dfcdbcd;p=gcc.git

* search.c (lookup_base): Handle NULL_TREE.

From-SVN: r196738
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b28025defb..c0e15426719 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 2013-03-16  Jason Merrill  <jason@redhat.com>
 
+	* search.c (lookup_base): Handle NULL_TREE.
+
 	PR c++/56481
 	* semantics.c (potential_constant_expression_1): Use of 'this' in
 	a non-constexpr function makes the expression not potentially
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 4cc02ba7dfc..54a5e4ae75d 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -188,6 +188,14 @@ lookup_base (tree t, tree base, base_access access,
   tree t_binfo;
   base_kind bk;
 
+  /* "Nothing" is definitely not derived from Base.  */
+  if (t == NULL_TREE)
+    {
+      if (kind_ptr)
+	*kind_ptr = bk_not_base;
+      return NULL_TREE;
+    }
+
   if (t == error_mark_node || base == error_mark_node)
     {
       if (kind_ptr)