diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/diagnostic/trailing1.C | 5 |
4 files changed, 18 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9469602..2544e48 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2019-05-09 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/90382 + Revert: + 2018-04-26 Paolo Carlini <paolo.carlini@oracle.com> + + * decl.c (grokdeclarator): Fix value assigned to typespec_loc, use + min_location. + 2019-05-08 Nathan Sidwell <nathan@acm.org> Kill DECL_SAVED_FUNCTION_DATA . diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 7f19d4a..36014dc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10423,8 +10423,8 @@ grokdeclarator (const cp_declarator *declarator, location_t typespec_loc = smallest_type_quals_location (type_quals, declspecs->locations); - typespec_loc = min_location (typespec_loc, - declspecs->locations[ds_type_spec]); + if (typespec_loc == UNKNOWN_LOCATION) + typespec_loc = declspecs->locations[ds_type_spec]; if (typespec_loc == UNKNOWN_LOCATION) typespec_loc = input_location; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f03c445..98e102b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-05-09 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/90382 + 2018-04-26 Paolo Carlini <paolo.carlini@oracle.com> + + * g++.dg/diagnostic/trailing1.C: New. + 2019-05-09 Richard Biener <rguenther@suse.de> PR tree-optimization/90395 diff --git a/gcc/testsuite/g++.dg/diagnostic/trailing1.C b/gcc/testsuite/g++.dg/diagnostic/trailing1.C deleted file mode 100644 index 369781e..0000000 --- a/gcc/testsuite/g++.dg/diagnostic/trailing1.C +++ /dev/null @@ -1,5 +0,0 @@ -// { dg-do compile { target c++11 } } - -int const foo1() -> double; // { dg-error "1:.foo1. function with trailing return type" } -int volatile foo2() -> double; // { dg-error "1:.foo2. function with trailing return type" } -int const volatile foo3() -> double; // { dg-error "1:.foo3. function with trailing return type" } |