diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-05-31 22:48:30 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-05-31 22:48:30 +0000 |
| commit | e17b3578a3b043e0ee9a8493224287e79f9bb2c9 (patch) | |
| tree | 8bf69c904b4e1c090f4fed19487a0ae1d79b5db4 /gcc | |
| parent | 5847e53ee7e2bb6665c0652f46a071aa78de90bd (diff) | |
| download | gcc-e17b3578a3b043e0ee9a8493224287e79f9bb2c9.zip gcc-e17b3578a3b043e0ee9a8493224287e79f9bb2c9.tar.gz gcc-e17b3578a3b043e0ee9a8493224287e79f9bb2c9.tar.bz2 | |
re PR c++/15701 (ICE with friends and template template parameter)
PR c++/15701
* friend.c (add_friend): Do not try to perform access checks for
functions from dependent classes.
PR c++/15701
* g++.dg/template/friend29.C: New test.
From-SVN: r82516
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/friend.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/friend29.C | 11 |
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4ead672..4549203 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-05-31 Mark Mitchell <mark@codesourcery.com> + + PR c++/15701 + * friend.c (add_friend): Do not try to perform access checks for + functions from dependent classes. + 2004-05-31 Gabriel Dos Reis <gdr@integrable-solutions.net> * cxx-pretty-print.c (pp_cxx_colon_colon): Expor. diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index e55adaa..f815b99 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -164,7 +164,11 @@ add_friend (tree type, tree decl, bool complain) } if (DECL_CLASS_SCOPE_P (decl)) - perform_or_defer_access_check (TYPE_BINFO (DECL_CONTEXT (decl)), decl); + { + tree class_binfo = TYPE_BINFO (DECL_CONTEXT (decl)); + if (!uses_template_parms (BINFO_TYPE (class_binfo))) + perform_or_defer_access_check (class_binfo, decl); + } maybe_add_class_template_decl_list (type, decl, /*friend_p=*/1); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a337797..67b637b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-05-31 Mark Mitchell <mark@codesourcery.com> + + PR c++/15701 + * g++.dg/template/friend29.C: New test. + 2004-05-31 Joseph S. Myers <jsm@polyomino.org.uk> PR c/15749 diff --git a/gcc/testsuite/g++.dg/template/friend29.C b/gcc/testsuite/g++.dg/template/friend29.C new file mode 100644 index 0000000..1c0c6f0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend29.C @@ -0,0 +1,11 @@ +// PR c++/15701 + +template<template<int> class T> struct A : T<0> +{ + void foo(); + template<template<int> class U> friend void A<U>::foo(); +}; + +template<int> struct B {}; + +A<B> a; |