From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 847333857C44; Wed, 26 Apr 2023 21:16:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 847333857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682543791; bh=7/ZrQAGaY/4pdxmGug15qCcwaO+s8dHsr/EG9HrGvXM=; h=From:To:Subject:Date:From; b=fOlluiD1mJwkfnMLQHFv3OqxodSSxUetnDscPO4zK5Aqmr2NwPzkhLmcazBrQtvpO WEm8RFP0nH768NwpX/EEVh7EW/0BR9EDzZyJqUUruy/7ub3lyGIE60YEZhx4j/4q6g Han49MRQbH1u0pZeuOmIytp/4Y0yeeek3BjsqUYs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-277] c++: unique friend shenanigans [PR69836] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 50d866038a910ceb9075b97295a12d77a8d09a3a X-Git-Newrev: 1e27e7e0985e055b3d4ec92e93976b709fdbe425 Message-Id: <20230426211631.847333857C44@sourceware.org> Date: Wed, 26 Apr 2023 21:16:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1e27e7e0985e055b3d4ec92e93976b709fdbe425 commit r14-277-g1e27e7e0985e055b3d4ec92e93976b709fdbe425 Author: Jason Merrill Date: Wed Feb 1 17:00:48 2023 -0500 c++: unique friend shenanigans [PR69836] Normally we re-instantiate a function declaration when we start to instantiate the body in case of multiple declarations. In this wacky testcase, this causes a problem because the type of the w_counter parameter depends on its declaration not being in scope yet, so the name lookup only finds the previous declaration. This isn't a problem for member functions, since they aren't subject to argument-dependent lookup. So let's just skip the regeneration for hidden friends. PR c++/69836 gcc/cp/ChangeLog: * pt.cc (regenerate_decl_from_template): Skip unique friends. gcc/testsuite/ChangeLog: * g++.dg/template/friend76.C: New test. Diff: --- gcc/cp/pt.cc | 6 ++++++ gcc/testsuite/g++.dg/template/friend76.C | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 678cb7930e3..e1c272b9817 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -26458,6 +26458,11 @@ regenerate_decl_from_template (tree decl, tree tmpl, tree args) int args_depth; int parms_depth; + /* Don't bother with this for unique friends that can't be redeclared and + might change type if regenerated (PR69836). */ + if (DECL_UNIQUE_FRIEND_P (decl)) + goto done; + /* Use the source location of the definition. */ DECL_SOURCE_LOCATION (decl) = DECL_SOURCE_LOCATION (tmpl); @@ -26528,6 +26533,7 @@ regenerate_decl_from_template (tree decl, tree tmpl, tree args) else gcc_unreachable (); + done: pop_access_scope (decl); } diff --git a/gcc/testsuite/g++.dg/template/friend76.C b/gcc/testsuite/g++.dg/template/friend76.C new file mode 100644 index 00000000000..ce3ed201dda --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend76.C @@ -0,0 +1,36 @@ +// PR c++/69836 +// { dg-do compile { target c++11 } } + +template struct number : public number { + static constexpr int value = N; + static constexpr number prev() { return {}; } +}; +template<> struct number<0> { static constexpr int value = 0; }; + +template struct S { enum { value = N }; }; + +template constexpr S increment(S) { return {}; } + +#define RETURN(R) -> decltype(R) { return R; } + +#define INIT(TYPE) \ + using W_ThisType = TYPE; \ + friend constexpr S<0> state(number<0>, W_ThisType**) { return {}; } + +#define STUFF \ + friend constexpr auto state(number{}, static_cast(nullptr)))::value+1> w_counter, \ + W_ThisType **w_this) \ + RETURN(increment(state(w_counter.prev(), w_this))) + + +template struct TemplateObject { + INIT(TemplateObject) + STUFF + STUFF +}; + +int main() { + TemplateObject t; + constexpr auto s = state(number<>{}, static_cast**>(nullptr)) ; + static_assert(s.value == 2, ""); +}