diff options
| author | Fabien Chêne <fabien@gcc.gnu.org> | 2014-04-04 10:03:19 +0200 |
|---|---|---|
| committer | Fabien Chêne <fabien@gcc.gnu.org> | 2014-04-04 10:03:19 +0200 |
| commit | d4a69ff4cc73c73c6bb9fe85c08f245f8e7e8f18 (patch) | |
| tree | 1f45f582301ad9b8c2cd02fe14457df7325c5526 | |
| parent | 2d18d29532a35c3eb0fafa54fec9f654974c9b5c (diff) | |
| download | gcc-d4a69ff4cc73c73c6bb9fe85c08f245f8e7e8f18.zip gcc-d4a69ff4cc73c73c6bb9fe85c08f245f8e7e8f18.tar.gz gcc-d4a69ff4cc73c73c6bb9fe85c08f245f8e7e8f18.tar.bz2 | |
decl.c (duplicate_decls): Check for the return of permerror before emitting a note.
2014-04-04 Fabien Chêne <fabien@gcc.gnu.org>
* decl.c (duplicate_decls): Check for the return of permerror
before emitting a note.
2014-04-04 Fabien Chêne <fabien@gcc.gnu.org>
* g++.old-deja/g++.robertl/eb121.C: Adjust.
* g++.old-deja/g++.jason/overload21.C: Likewise.
* g++.old-deja/g++.law/init5.C: Likewise.
From-SVN: r209071
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/overload21.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.law/init5.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.robertl/eb121.C | 2 |
6 files changed, 21 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d174767..a575654 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Fabien Chêne <fabien@gcc.gnu.org> + + * decl.c (duplicate_decls): Check for the return of permerror + before emitting a note. + 2014-04-03 Nathan Sidwell <nathan@codesourcery.com> * class.c (accessible_nvdtor_p): New. @@ -66,9 +71,9 @@ 2014-03-26 Fabien Chêne <fabien@gcc.gnu.org> PR c++/52369 - * cp/method.c (walk_field_subobs): Improve the diagnostic + * method.c (walk_field_subobs): Improve the diagnostic locations for both REFERENCE_TYPEs and non-static const members. - * cp/init.c (diagnose_uninitialized_cst_or_ref_member): Use %q#D + * init.c (diagnose_uninitialized_cst_or_ref_member): Use %q#D instead of %qD to be consistent with the c++11 diagnostic. 2014-03-25 Jason Merrill <jason@redhat.com> diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f3a081b..f1743dd 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1737,9 +1737,9 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) if (permerror (input_location, "default argument given for parameter " "%d of %q#D", i, newdecl)) - permerror (DECL_SOURCE_LOCATION (olddecl), - "previous specification in %q#D here", - olddecl); + inform (DECL_SOURCE_LOCATION (olddecl), + "previous specification in %q#D here", + olddecl); } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d470b1e..0446485 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-04-04 Fabien Chêne <fabien@gcc.gnu.org> + + * g++.old-deja/g++.robertl/eb121.C: Adjust. + * g++.old-deja/g++.jason/overload21.C: Likewise. + * g++.old-deja/g++.law/init5.C: Likewise. + 2014-04-03 Cong Hou <congh@google.com> PR tree-optimization/60505 @@ -22,7 +28,7 @@ PR ipa/60659 * testsuite/g++.dg/torture/pr60659.C: New testcase. - + 2014-04-02 Bill Schmidt <wschmidt@linux.vnet.ibm.com> PR tree-optimization/60733 diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload21.C b/gcc/testsuite/g++.old-deja/g++.jason/overload21.C index 7239793..125aee0 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/overload21.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/overload21.C @@ -1,6 +1,6 @@ // { dg-do assemble } struct X { - void f (int = 4, char = 'r'); // { dg-error "previous specification" } + void f (int = 4, char = 'r'); // { dg-message "previous specification" } void g (int = 4, char = 'r'); // { dg-message "previous specification" } }; diff --git a/gcc/testsuite/g++.old-deja/g++.law/init5.C b/gcc/testsuite/g++.old-deja/g++.law/init5.C index c1d647b..7ed89e2 100644 --- a/gcc/testsuite/g++.old-deja/g++.law/init5.C +++ b/gcc/testsuite/g++.old-deja/g++.law/init5.C @@ -11,8 +11,8 @@ extern int fred( int); class X { public : - void f( int = fred( 0) ) ; // { dg-error "" } previous spec + void f( int = fred( 0) ) ; // { dg-message "previous spec" } } ; -void X::f( int x = fred( 0) ) {// { dg-error "" } .* +void X::f( int x = fred( 0) ) { // { dg-error "default argument" } } diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C index e01d747..036c8d5 100644 --- a/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C +++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb121.C @@ -3,7 +3,7 @@ class A { private: int i1_; public: - void f(int const i1 = 1); // { dg-error "previous specification" } + void f(int const i1 = 1); // { dg-message "previous specification" } }; void |