diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-08-03 14:23:34 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-08-03 14:23:34 +0000 |
| commit | 6cb893080b617bc70a23ba35907ea79cc8c25a80 (patch) | |
| tree | 02e339c4865c729bceeb886fd6f0a4043b662970 | |
| parent | ae0b7dfc7e9084c45901687320a7d9d285a530ba (diff) | |
| download | gcc-6cb893080b617bc70a23ba35907ea79cc8c25a80.zip gcc-6cb893080b617bc70a23ba35907ea79cc8c25a80.tar.gz gcc-6cb893080b617bc70a23ba35907ea79cc8c25a80.tar.bz2 | |
re PR c++/11704 (ICE in type_dependent_expression_p with wrong method call in template class)
cp:
PR c++/11704
* pt.c (type_dependent_expression_p): Cope with COMPONENT_REF with
unknown type.
testsuite:
PR c++/11704
* g++.dg/template/dependent-expr2.C: New test.
From-SVN: r70119
| -rw-r--r-- | gcc/cp/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/dependent-expr2.C | 23 |
4 files changed, 45 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index de0923a..a8c8a97 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,13 @@ +2003-08-03 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/11704 + * pt.c (type_dependent_expression_p): Cope with COMPONENT_REF with + unknown type. + + PR c++/11766 + * typeck.c (comp_ptr_ttypes_real): Don't loop on pointers to + member functions. + 2003-08-02 Nathan Sidwell <nathan@codesourcery.com> PR c++/9447 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 185a203..706691c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11625,6 +11625,15 @@ type_dependent_expression_p (tree expression) { if (TREE_CODE (expression) == ADDR_EXPR) return type_dependent_expression_p (TREE_OPERAND (expression, 0)); + if (TREE_CODE (expression) == COMPONENT_REF) + { + if (type_dependent_expression_p (TREE_OPERAND (expression, 0))) + return true; + expression = TREE_OPERAND (expression, 1); + if (TREE_CODE (expression) == IDENTIFIER_NODE) + return false; + } + if (TREE_CODE (expression) == BASELINK) expression = BASELINK_FUNCTIONS (expression); if (TREE_CODE (expression) == TEMPLATE_ID_EXPR) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61d9742..04c94a2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2003-08-03 Nathan Sidwell <nathan@codesourcery.com> + PR c++/11704 + * g++.dg/template/dependent-expr2.C: New test. + PR c++/11766 * g++.dg/expr/ptrmem1.C: New test. diff --git a/gcc/testsuite/g++.dg/template/dependent-expr2.C b/gcc/testsuite/g++.dg/template/dependent-expr2.C new file mode 100644 index 0000000..9c9d5f9 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dependent-expr2.C @@ -0,0 +1,23 @@ +// { dg-do compile } + +// Copyright (C) 2003 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 2 Aug 2003 <nathan@codesourcery.com> + +// PR 11704. ICE + +struct A +{ + int foo() + { + return 5; + } +}; + +template <class T> // If B is not template it works +struct B +{ + bool bar(A& a) + { + return a.foo == 0; // { dg-error "insufficient context" "" } + } +}; |