c++: deleted after first declaration [PR101106]

An explicitly deleted function must be deleted on its first declaration.  We
were diagnosing this error only with -Wpedantic, but always giving the
"previous declaration" note.  For GCC 11, keep the -Wpedantic dependency,
just make the note depend on the previous diagnostic.

	PR c++/101106

gcc/cp/ChangeLog:

	* decl.c (duplicate_decls): Condition note on return value of pedwarn.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp0x/deleted15.C: New test.
This commit is contained in:
Jason Merrill 2021-06-17 15:31:15 -04:00
parent 4f28192238
commit 2348a458e1
2 changed files with 10 additions and 5 deletions

View File

@ -2160,11 +2160,10 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
if (DECL_DELETED_FN (newdecl))
{
auto_diagnostic_group d;
pedwarn (newdecl_loc, OPT_Wpedantic,
"deleted definition of %qD is not first declaration",
newdecl);
inform (olddecl_loc,
"previous declaration of %qD", olddecl);
if (pedwarn (newdecl_loc, OPT_Wpedantic, "deleted definition of "
"%qD is not first declaration", newdecl))
inform (olddecl_loc,
"previous declaration of %qD", olddecl);
}
DECL_DELETED_FN (newdecl) |= DECL_DELETED_FN (olddecl);
}

View File

@ -0,0 +1,6 @@
// PR c++/101106
// { dg-do compile { target c++11 } }
// { dg-options "" }
int f(); // { dg-bogus "previous declaration" }
int f() = delete;