From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 2 Jul 2018 21:42:10 +0000 (+0000)
Subject: parser.c (set_and_check_decl_spec_loc): Use rich_location::add_range in error message... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a5eae716f66322842da21c17002c66b10c6f6b40;p=gcc.git

parser.c (set_and_check_decl_spec_loc): Use rich_location::add_range in error message about __thread and thread_local...

/cp
2018-07-02  Paolo Carlini  <paolo.carlini@oracle.com>

	* parser.c (set_and_check_decl_spec_loc): Use rich_location::add_range
	in error message about __thread and thread_local at the same time.

/testsuite
2018-07-02  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/thread-thread_local.C: New.

From-SVN: r262321
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 556b154b14e..53bcb1f9319 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* parser.c (set_and_check_decl_spec_loc): Use rich_location::add_range
+	in error message about __thread and thread_local at the same time.
+
 2018-06-29  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/86184
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index a076de146e6..5edd0eed76e 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -28377,12 +28377,15 @@ set_and_check_decl_spec_loc (cp_decl_specifier_seq *decl_specs,
       else if (ds == ds_thread)
 	{
 	  bool gnu = token_is__thread (token);
+	  gcc_rich_location richloc (location);
 	  if (gnu != decl_specs->gnu_thread_keyword_p)
-	    error_at (location,
-		      "both %<__thread%> and %<thread_local%> specified");
+	    {
+	      richloc.add_range (decl_specs->locations[ds_thread], false);
+	      error_at (&richloc,
+			"both %<__thread%> and %<thread_local%> specified");
+	    }
 	  else
 	    {
-	      gcc_rich_location richloc (location);
 	      richloc.add_fixit_remove ();
 	      error_at (&richloc, "duplicate %qD", token->u.value);
 	    }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b4eabd97529..f2485db4f0f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/diagnostic/thread-thread_local.C: New.
+
 2018-07-02  Martin Liska  <mliska@suse.cz>
 
         PR testsuite/86366
diff --git a/gcc/testsuite/g++.dg/diagnostic/thread-thread_local.C b/gcc/testsuite/g++.dg/diagnostic/thread-thread_local.C
new file mode 100644
index 00000000000..4f2264ce05e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/thread-thread_local.C
@@ -0,0 +1,13 @@
+// { dg-options "-fdiagnostics-show-caret" }
+// { dg-do compile { target c++11 } }
+
+thread_local __thread int a;  // { dg-error "14:both .__thread. and .thread_local. specified" }
+/* { dg-begin-multiline-output "" }
+ thread_local __thread int a;
+ ~~~~~~~~~~~~ ^~~~~~~~
+   { dg-end-multiline-output "" } */
+__thread thread_local int b;  // { dg-error "10:both .__thread. and .thread_local. specified" }
+/* { dg-begin-multiline-output "" }
+ __thread thread_local int b;
+ ~~~~~~~~ ^~~~~~~~~~~~
+   { dg-end-multiline-output "" } */