[C++] Fix four more locations

Message ID e1b65b04-ede0-edc1-dbc2-f764ae5d56fa@oracle.com
State New
Headers show
Series
  • [C++] Fix four more locations
Related show

Commit Message

Paolo Carlini Jan. 7, 2019, 5:08 p.m.
Hi,

should be straightforward material. Tested x86_64-linux, as usual.

Thanks, Paolo.

/////////////////////
/cp
2019-01-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (start_decl): Improve two error_at locations.
	(expand_static_init): Likewise.

/testsuite
2019-01-07  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/diagnostic/constexpr1.C: New.
	* g++.dg/diagnostic/thread1.C: Likewise.

Comments

Jason Merrill Jan. 7, 2019, 7:21 p.m. | #1
OK.

Jason
Christophe Lyon Jan. 8, 2019, 10:24 a.m. | #2
On Mon, 7 Jan 2019 at 18:08, Paolo Carlini <paolo.carlini@oracle.com> wrote:
>

> Hi,

>

> should be straightforward material. Tested x86_64-linux, as usual.

>

> Thanks, Paolo.

>

> /////////////////////

>


Hi,

The new g++.dg/diagnostic/thread1.C passes on aarch64, but fails on arm:
FAIL: g++.dg/diagnostic/thread1.C  -std=c++14  (test for errors, line 13)
FAIL: g++.dg/diagnostic/thread1.C  -std=c++14 (test for excess errors)
FAIL: g++.dg/diagnostic/thread1.C  -std=c++17  (test for errors, line 13)
FAIL: g++.dg/diagnostic/thread1.C  -std=c++17 (test for excess errors)

the logs say:
/gcc/testsuite/g++.dg/diagnostic/thread1.C:13:12: error: non-local
variable 's' declared '__thread' needs dynamic initialization

I don't know why the error message does not match?

Christophe
Paolo Carlini Jan. 8, 2019, 11:48 a.m. | #3
Hi,

On 08/01/19 11:24, Christophe Lyon wrote:
> On Mon, 7 Jan 2019 at 18:08, Paolo Carlini <paolo.carlini@oracle.com> wrote:

>> Hi,

>>

>> should be straightforward material. Tested x86_64-linux, as usual.

>>

>> Thanks, Paolo.

>>

>> /////////////////////

>>

> Hi,

>

> The new g++.dg/diagnostic/thread1.C passes on aarch64, but fails on arm:

> FAIL: g++.dg/diagnostic/thread1.C  -std=c++14  (test for errors, line 13)

> FAIL: g++.dg/diagnostic/thread1.C  -std=c++14 (test for excess errors)

> FAIL: g++.dg/diagnostic/thread1.C  -std=c++17  (test for errors, line 13)

> FAIL: g++.dg/diagnostic/thread1.C  -std=c++17 (test for excess errors)

>

> the logs say:

> /gcc/testsuite/g++.dg/diagnostic/thread1.C:13:12: error: non-local

> variable 's' declared '__thread' needs dynamic initialization

>

> I don't know why the error message does not match?


Evidently on some targets that variable also needs dynamic 
initialization, the issue isn't just that it has a non-trivial 
destructor. Thus, I'm simply going to shorten by one word the expected 
string.

Thanks, Paolo.

Patch

Index: cp/decl.c
===================================================================
--- cp/decl.c	(revision 267651)
+++ cp/decl.c	(working copy)
@@ -5235,10 +5236,12 @@  start_decl (const cp_declarator *declarator,
     {
       bool ok = false;
       if (CP_DECL_THREAD_LOCAL_P (decl))
-	error ("%qD declared %<thread_local%> in %<constexpr%> function",
-	       decl);
+	error_at (DECL_SOURCE_LOCATION (decl),
+		  "%qD declared %<thread_local%> in %<constexpr%> function",
+		  decl);
       else if (TREE_STATIC (decl))
-	error ("%qD declared %<static%> in %<constexpr%> function", decl);
+	error_at (DECL_SOURCE_LOCATION (decl),
+		  "%qD declared %<static%> in %<constexpr%> function", decl);
       else
 	ok = true;
       if (!ok)
@@ -8253,18 +8256,18 @@  expand_static_init (tree decl, tree init)
   if (CP_DECL_THREAD_LOCAL_P (decl) && DECL_GNU_TLS_P (decl)
       && !DECL_FUNCTION_SCOPE_P (decl))
     {
+      location_t dloc = DECL_SOURCE_LOCATION (decl);
       if (init)
-	error ("non-local variable %qD declared %<__thread%> "
-	       "needs dynamic initialization", decl);
+	error_at (dloc, "non-local variable %qD declared %<__thread%> "
+		  "needs dynamic initialization", decl);
       else
-	error ("non-local variable %qD declared %<__thread%> "
-	       "has a non-trivial destructor", decl);
+	error_at (dloc, "non-local variable %qD declared %<__thread%> "
+		  "has a non-trivial destructor", decl);
       static bool informed;
       if (!informed)
 	{
-	  inform (DECL_SOURCE_LOCATION (decl),
-		  "C++11 %<thread_local%> allows dynamic initialization "
-		  "and destruction");
+	  inform (dloc, "C++11 %<thread_local%> allows dynamic "
+		  "initialization and destruction");
 	  informed = true;
 	}
       return;
Index: testsuite/g++.dg/diagnostic/constexpr1.C
===================================================================
--- testsuite/g++.dg/diagnostic/constexpr1.C	(nonexistent)
+++ testsuite/g++.dg/diagnostic/constexpr1.C	(working copy)
@@ -0,0 +1,5 @@ 
+// { dg-do compile { target c++11 } }
+
+constexpr void foo() { thread_local int i __attribute__((unused)) {}; }  // { dg-error "41:.i. declared .thread_local." }
+
+constexpr void bar() { static int i __attribute__((unused)) {}; }  // { dg-error "35:.i. declared .static." }
Index: testsuite/g++.dg/diagnostic/thread1.C
===================================================================
--- testsuite/g++.dg/diagnostic/thread1.C	(nonexistent)
+++ testsuite/g++.dg/diagnostic/thread1.C	(working copy)
@@ -0,0 +1,13 @@ 
+// { dg-do compile { target c++11 } }
+
+int foo();
+
+__thread int i __attribute__((unused)) = foo();  // { dg-error "14:non-local variable .i. declared .__thread. needs" }
+
+struct S
+{
+  constexpr S() {}
+  ~S();
+};
+
+__thread S s __attribute__((unused));  // { dg-error "12:non-local variable .s. declared .__thread. has" }