diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-05-20 15:16:48 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-05-20 15:16:48 +0000 |
| commit | 512eacee8fc5fd97faf037f45d0781a79db5f3e9 (patch) | |
| tree | 6b70500cb62c5ae23398ffff2782c8616c885cb7 | |
| parent | efa72acd629c32e663a54cc1ddfb64742dbe41fd (diff) | |
| download | gcc-512eacee8fc5fd97faf037f45d0781a79db5f3e9.zip gcc-512eacee8fc5fd97faf037f45d0781a79db5f3e9.tar.gz gcc-512eacee8fc5fd97faf037f45d0781a79db5f3e9.tar.bz2 | |
re PR c++/60373 (half warning: visibility attribute ignored because it)
/cp
2014-05-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60373
* decl.c (duplicate_decls): Replace pair of warning_at with
warning_at + inform.
(maybe_commonize_var): Likewise.
/testsuite
2014-05-20 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/60373
* g++.dg/cpp0x/Wattributes1.C: New.
* g++.dg/ext/visibility/redecl1.C: Adjust.
* g++.dg/ext/visibility/visibility-7.C: Likewise.
From-SVN: r210646
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/Wattributes1.C | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/visibility/redecl1.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/visibility/visibility-7.C | 2 |
6 files changed, 35 insertions, 13 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6886b96..b6d945f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/60373 + * decl.c (duplicate_decls): Replace pair of warning_at with + warning_at + inform. + (maybe_commonize_var): Likewise. + 2014-05-20 Richard Sandiford <rsandifo@linux.vnet.ibm.com> PR bootstrap/61210 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 81f12731..ab91928 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2306,10 +2306,11 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) && DECL_VISIBILITY_SPECIFIED (newdecl) && DECL_VISIBILITY (newdecl) != DECL_VISIBILITY (olddecl)) { - warning_at (input_location, OPT_Wattributes, - "%q+D: visibility attribute ignored because it", newdecl); - warning_at (DECL_SOURCE_LOCATION (olddecl), OPT_Wattributes, - "conflicts with previous declaration here"); + if (warning_at (DECL_SOURCE_LOCATION (newdecl), OPT_Wattributes, + "%qD: visibility attribute ignored because it " + "conflicts with previous declaration", newdecl)) + inform (DECL_SOURCE_LOCATION (olddecl), + "previous declaration of %qD", olddecl); } /* Choose the declaration which specified visibility. */ if (DECL_VISIBILITY_SPECIFIED (olddecl)) @@ -5026,13 +5027,12 @@ maybe_commonize_var (tree decl) be merged. */ TREE_PUBLIC (decl) = 0; DECL_COMMON (decl) = 0; - warning_at (input_location, 0, - "sorry: semantics of inline function static " - "data %q+#D are wrong (you%'ll wind up " - "with multiple copies)", decl); - warning_at (DECL_SOURCE_LOCATION (decl), 0, - " you can work around this by removing " - "the initializer"); + if (warning_at (DECL_SOURCE_LOCATION (decl), 0, + "sorry: semantics of inline function static " + "data %q#D are wrong (you%'ll wind up " + "with multiple copies)", decl)) + inform (DECL_SOURCE_LOCATION (decl), + "you can work around this by removing the initializer"); } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1440e04..be9a7de 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/60373 + * g++.dg/cpp0x/Wattributes1.C: New. + * g++.dg/ext/visibility/redecl1.C: Adjust. + * g++.dg/ext/visibility/visibility-7.C: Likewise. + 2014-05-20 Bill Schmidt <wschmidt@linux.vnet.ibm.com> * gcc.target/powerpc/vsxcopy.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp0x/Wattributes1.C b/gcc/testsuite/g++.dg/cpp0x/Wattributes1.C new file mode 100644 index 0000000..4d3c29c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/Wattributes1.C @@ -0,0 +1,8 @@ +// PR c++/60373 +// { dg-do compile { target c++11 } } +// { dg-require-visibility "" } + +#include <new> +__attribute__((visibility("hidden")))void*operator new(std::size_t); // { dg-warning "visibility attribute ignored" } + +// { dg-message "previous declaration" "" { target *-*-* } 128 } diff --git a/gcc/testsuite/g++.dg/ext/visibility/redecl1.C b/gcc/testsuite/g++.dg/ext/visibility/redecl1.C index b53335e..a85e6c3 100644 --- a/gcc/testsuite/g++.dg/ext/visibility/redecl1.C +++ b/gcc/testsuite/g++.dg/ext/visibility/redecl1.C @@ -3,5 +3,5 @@ struct __attribute((visibility("hidden"))) B; struct __attribute((visibility("default"))) B; // { dg-error "visibility" } -__attribute ((visibility ("hidden"))) void f(); // { dg-warning "previous" } +__attribute ((visibility ("hidden"))) void f(); // { dg-message "previous" } __attribute ((visibility ("default"))) void f(); // { dg-warning "visibility" } diff --git a/gcc/testsuite/g++.dg/ext/visibility/visibility-7.C b/gcc/testsuite/g++.dg/ext/visibility/visibility-7.C index ae45893..0a6e4ba 100644 --- a/gcc/testsuite/g++.dg/ext/visibility/visibility-7.C +++ b/gcc/testsuite/g++.dg/ext/visibility/visibility-7.C @@ -4,7 +4,7 @@ extern int __attribute__((visibility ("hidden"))) -xyzzy; /* { dg-warning "previous declaration here" "" } */ +xyzzy; /* { dg-message "previous declaration" "" } */ int __attribute__((visibility ("protected"))) |