diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.h | 7 |
5 files changed, 28 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 62e5417..ad35314 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-06-14 Marek Polacek <polacek@redhat.com> + + PR c++/90884 - stray note with -Wctor-dtor-privacy. + * class.c (maybe_warn_about_overly_private_class): Guard the call to + inform. + 2019-06-12 Jason Merrill <jason@redhat.com> PR c++/85552 - wrong instantiation of dtor for DMI. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 4fdb0f3..de37e43 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2150,10 +2150,10 @@ maybe_warn_about_overly_private_class (tree t) if (!nonprivate_ctor) { - warning (OPT_Wctor_dtor_privacy, - "%q#T only defines private constructors and has no friends", - t); - if (copy_or_move) + bool w = warning (OPT_Wctor_dtor_privacy, + "%q#T only defines private constructors and has " + "no friends", t); + if (w && copy_or_move) inform (DECL_SOURCE_LOCATION (copy_or_move), "%q#D is public, but requires an existing %q#T object", copy_or_move, t); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3cebc56..c7604d6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-06-14 Marek Polacek <polacek@redhat.com> + + PR c++/90884 - stray note with -Wctor-dtor-privacy. + * g++.dg/warn/ctor-dtor-privacy-4.C: New. + * g++.dg/warn/ctor-dtor-privacy-4.h: New. + 2019-06-14 Richard Biener <rguenther@suse.de> * gcc.dg/tree-ssa/ldist-26.c: Adjust. diff --git a/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.C b/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.C new file mode 100644 index 0000000..fcad34e --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.C @@ -0,0 +1,5 @@ +// PR c++/90884 +// { dg-options "-Wctor-dtor-privacy" } +// { dg-prune-output "In file included from" } + +#include "ctor-dtor-privacy-4.h" // { dg-bogus "is public" } diff --git a/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.h b/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.h new file mode 100644 index 0000000..d67fd26 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/ctor-dtor-privacy-4.h @@ -0,0 +1,7 @@ +#pragma GCC system_header + +namespace std { +struct __nonesuch { + __nonesuch(__nonesuch const &); +}; +} // namespace std |