diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ebbbb6219f7..6f0b96b5b4c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-18  Steve Ellcey  <sje@cup.hp.com>
+
+	PR c++/27495
+	* search.c (adjust_result_of_qualified_name_lookup): Change
+	assert to part of if statement.
+
 2006-07-17  Steve Ellcey  <sje@cup.hp.com>
 
 	PR c++/28291
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 0682ff286bd..50e704fe366 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -1480,14 +1480,13 @@ adjust_result_of_qualified_name_lookup (tree decl,
 					tree context_class)
 {
   if (context_class && context_class != error_mark_node
+      && CLASS_TYPE_P (context_class)
       && CLASS_TYPE_P (qualifying_scope)
       && DERIVED_FROM_P (qualifying_scope, context_class)
       && BASELINK_P (decl))
     {
       tree base;
 
-      gcc_assert (CLASS_TYPE_P (context_class));
-
       /* Look for the QUALIFYING_SCOPE as a base of the CONTEXT_CLASS.
 	 Because we do not yet know which function will be chosen by
 	 overload resolution, we cannot yet check either accessibility