aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSteve Ellcey <sje@cup.hp.com>2006-07-18 17:01:19 +0000
committerSteve Ellcey <sje@gcc.gnu.org>2006-07-18 17:01:19 +0000
commit9c23e505d81d0f4f915349752421ff80faacbb94 (patch)
tree02688a8db55abe0a6a4c08418a66251156619c1c /gcc
parentb3cccd5850889030826b2224bdd0a775c582f869 (diff)
downloadgcc-9c23e505d81d0f4f915349752421ff80faacbb94.zip
gcc-9c23e505d81d0f4f915349752421ff80faacbb94.tar.gz
gcc-9c23e505d81d0f4f915349752421ff80faacbb94.tar.bz2
re PR c++/27495 (ICE using "." instead of "->")
PR c++/27495 * search.c (adjust_result_of_qualified_name_lookup): Change assert to part of if statement. From-SVN: r115557
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/search.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ebbbb62..6f0b96b 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 0682ff2..50e704f 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