re PR preprocessor/90382 (ICE in linemap_macro_map_loc_to_exp_point, at libcpp/line-map.c:1061)

/cp
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.

/testsuite
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.

From-SVN: r271032

gcc/cp/ChangeLog

+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 .

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;
 

gcc/testsuite/ChangeLog

+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

gcc/testsuite/g++.dg/diagnostic/trailing1.C

-// { 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" }