From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 12540394881E; Wed, 11 May 2022 14:59:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12540394881E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r9-10155] c++: deleted fn and noexcept inst [PR101532, PR104225] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: c6432e17960799509c48df6b500a8d069110980b X-Git-Newrev: 4df77364f7fd9ce88c012843fff124346e4d3c06 Message-Id: <20220511145952.12540394881E@sourceware.org> Date: Wed, 11 May 2022 14:59:52 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2022 14:59:52 -0000 https://gcc.gnu.org/g:4df77364f7fd9ce88c012843fff124346e4d3c06 commit r9-10155-g4df77364f7fd9ce88c012843fff124346e4d3c06 Author: Patrick Palka Date: Tue Jan 25 15:04:49 2022 -0500 c++: deleted fn and noexcept inst [PR101532, PR104225] Here when attempting to use B's implicitly deleted default constructor, mark_used rightfully returns false, but for the wrong reason: it tries to instantiate the synthesized noexcept specifier which then only silently fails because get_defaulted_eh_spec suppresses diagnostics for deleted functions. This lack of diagnostics causes us to crash on the first testcase below (thanks to the assert in finish_expr_stmt), and silently accept the second testcase. To fix this, this patch makes mark_used avoid attempting to instantiate the noexcept specifier of a deleted function, so that we'll instead directly reject (and diagnose) the function due to its deletedness. PR c++/101532 PR c++/104225 gcc/cp/ChangeLog: * decl2.c (mark_used): Don't consider maybe_instantiate_noexcept on a deleted function. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/nsdmi-template21.C: New test. * g++.dg/cpp0x/nsdmi-template21a.C: New test. (cherry picked from commit bc90dd0ecf02e11d47d1af7f627e2e2acaa40106) Diff: --- gcc/cp/decl2.c | 1 + gcc/testsuite/g++.dg/cpp0x/nsdmi-template21.C | 8 ++++++++ gcc/testsuite/g++.dg/cpp0x/nsdmi-template21a.C | 10 ++++++++++ 3 files changed, 19 insertions(+) diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 672bd62f1ce..b64a4d7caa1 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -5403,6 +5403,7 @@ mark_used (tree decl, tsubst_flags_t complain) used_types_insert (DECL_CONTEXT (decl)); if (TREE_CODE (decl) == FUNCTION_DECL + && !DECL_DELETED_FN (decl) && !maybe_instantiate_noexcept (decl, complain)) return false; diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21.C new file mode 100644 index 00000000000..79d43a54153 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21.C @@ -0,0 +1,8 @@ +// PR c++/101532 +// { dg-do compile { target c++11 } } + +struct A { private: ~A(); }; + +template struct B { A a = A(); }; // { dg-error "private" } + +B b; // { dg-error "deleted" } diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21a.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21a.C new file mode 100644 index 00000000000..08fd37b8035 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-template21a.C @@ -0,0 +1,10 @@ +// PR c++/104225 +// { dg-do compile { target c++11 } } + +struct A { private: ~A(); }; + +template struct B { A a = A(); }; // { dg-error "private" } + +int main() { + new B; // { dg-error "deleted" } +}