From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 26 Apr 2019 11:46:15 +0000 (+0000)
Subject: decl.c (grokdeclarator): Fix value assigned to typespec_loc, use min_location.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aaa94b3c890f4b43ecb8f1134ea0e4c6af75768d;p=gcc.git

decl.c (grokdeclarator): Fix value assigned to typespec_loc, use min_location.

/cp
2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokdeclarator): Fix value assigned to typespec_loc, use
	min_location.

/testsuite
2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/trailing1.C: New.

From-SVN: r270597
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 059a7fd0ea6..c78683d3949 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (grokdeclarator): Fix value assigned to typespec_loc, use
+	min_location.
+
 2019-04-24  Jason Merrill  <jason@redhat.com>
 
 	PR c++/90227 - error with template parameter packs.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 01c89cd572d..49ab3878896 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10417,8 +10417,8 @@ grokdeclarator (const cp_declarator *declarator,
 
   location_t typespec_loc = smallest_type_quals_location (type_quals,
 						      declspecs->locations);
-  if (typespec_loc == UNKNOWN_LOCATION)
-    typespec_loc = declspecs->locations[ds_type_spec];
+  typespec_loc = min_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 90e8d8b2030..13416da786a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/trailing1.C: New.
+
 2019-04-26  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* gcc.dg/alias-16.c: New test.
diff --git a/gcc/testsuite/g++.dg/diagnostic/trailing1.C b/gcc/testsuite/g++.dg/diagnostic/trailing1.C
new file mode 100644
index 00000000000..369781e56d5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/trailing1.C
@@ -0,0 +1,5 @@
+// { 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" }