diff options
| author | Jason Merrill <jason@redhat.com> | 2013-12-12 22:58:48 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-12-12 22:58:48 -0500 |
| commit | 4149642428e2cffdd0ec2c7d14434b2c40b7de21 (patch) | |
| tree | 3a7c42192e0a6937b868e4b57f13c0b3e54a34ba /gcc | |
| parent | 0bce3228e52e0481b785723d9ba6ff039bdb13de (diff) | |
| download | gcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.zip gcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.tar.gz gcc-4149642428e2cffdd0ec2c7d14434b2c40b7de21.tar.bz2 | |
re PR c++/58954 (accessing a private member function in decltype of a friend class causes access control error)
PR c++/58954
* pt.c (resolve_overloaded_unification): Use instantiate_template.
From-SVN: r205952
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/access02.C | 39 |
3 files changed, 45 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ca4a321..59c1d53 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-12-12 Jason Merrill <jason@redhat.com> + + PR c++/58954 + * pt.c (resolve_overloaded_unification): Use instantiate_template. + 2013-12-12 Jakub Jelinek <jakub@redhat.com> PR c++/58627 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2c64a71..d566afd 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -16407,7 +16407,7 @@ resolve_overloaded_unification (tree tparms, if (subargs != error_mark_node && !any_dependent_template_arguments_p (subargs)) { - elem = tsubst (TREE_TYPE (fn), subargs, tf_none, NULL_TREE); + elem = TREE_TYPE (instantiate_template (fn, subargs, tf_none)); if (try_one_overload (tparms, targs, tempargs, parm, elem, strict, sub_strict, addr_p, explain_p) && (!goodfn || !same_type_p (goodfn, elem))) diff --git a/gcc/testsuite/g++.dg/cpp0x/access02.C b/gcc/testsuite/g++.dg/cpp0x/access02.C new file mode 100644 index 0000000..74960a6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/access02.C @@ -0,0 +1,39 @@ +// PR c++/58954 +// { dg-require-effective-target c++11 } + +template<class T> +T&& declval(); + +template<class T> +struct foo_argument +{ + template<class Ret, class C, class Arg> + static Arg test(Ret (C::*)(Arg)); + + typedef decltype(test(&T::template foo<>)) type; +}; + +template<class T, class> +struct dependent { typedef T type; }; + +template<class T> +struct base +{ + template<class Ignore = void> + auto foo(int i) -> decltype(declval< + typename dependent<T&, Ignore>::type + >().foo_impl(i)); +}; + +struct derived : base<derived> +{ + friend struct base<derived>; +private: + int foo_impl(int i); +}; + +int main() +{ + foo_argument<derived>::type var = 0; + return var; +} |