From: Jason Merrill Date: Wed, 22 Jun 2022 22:19:11 +0000 (-0400) Subject: c++: dependence of baselink [PR105964] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c85cea9ca165b0b771d9f913016c9dc8db46b5d7;p=test_jj.git c++: dependence of baselink [PR105964] helper::c isn't dependent just because we haven't deduced its return type yet. type_dependent_expression_p already knows how to deal with that for bare FUNCTION_DECL, but needs to learn to look through a BASELINK. PR c++/105964 gcc/cp/ChangeLog: * pt.cc (type_dependent_expression_p): Look through BASELINK. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/nontype-auto21.C: New test. --- diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 214ad84..6723800 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -27892,6 +27892,15 @@ type_dependent_expression_p (tree expression) && DECL_INITIAL (expression)) return true; + /* Pull a FUNCTION_DECL out of a BASELINK if we can. */ + if (BASELINK_P (expression)) + { + if (BASELINK_OPTYPE (expression) + && dependent_type_p (BASELINK_OPTYPE (expression))) + return true; + expression = BASELINK_FUNCTIONS (expression); + } + /* A function or variable template-id is type-dependent if it has any dependent template arguments. */ if (VAR_OR_FUNCTION_DECL_P (expression) diff --git a/gcc/testsuite/g++.dg/cpp1z/nontype-auto21.C b/gcc/testsuite/g++.dg/cpp1z/nontype-auto21.C new file mode 100644 index 0000000..376d632 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/nontype-auto21.C @@ -0,0 +1,20 @@ +// PR c++/105964 +// { dg-do compile { target c++17 } } + +struct token {}; + +struct example {}; + +template< typename > +struct helper +{ + static constexpr auto c() { return 42; } +}; + +struct impostor_c +{ + template< typename T, auto= helper< T >::c > + static example func(); +}; + +example c= impostor_c::func< token >();