From 2c86a5741f00f3a85ccd685f250070013c67fc90 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 7 Jan 2019 22:28:30 +0000 Subject: [PATCH] decl.c (start_decl): Improve two error_at locations. /cp 2019-01-07 Paolo Carlini * decl.c (start_decl): Improve two error_at locations. (expand_static_init): Likewise. /testsuite 2019-01-07 Paolo Carlini * g++.dg/diagnostic/constexpr1.C: New. * g++.dg/diagnostic/thread1.C: Likewise. From-SVN: r267662 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 22 +++++++++++--------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/diagnostic/constexpr1.C | 5 +++++ gcc/testsuite/g++.dg/diagnostic/thread1.C | 13 ++++++++++++ 5 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/diagnostic/constexpr1.C create mode 100644 gcc/testsuite/g++.dg/diagnostic/thread1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5267b9d24f7..4da1c82334a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-01-07 Paolo Carlini + + * decl.c (start_decl): Improve two error_at locations. + (expand_static_init): Likewise. + 2019-01-07 Marek Polacek PR c++/88741 - wrong error with initializer-string. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 1fc7a1acf56..220a95c4b0f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5235,10 +5235,12 @@ start_decl (const cp_declarator *declarator, { bool ok = false; if (CP_DECL_THREAD_LOCAL_P (decl)) - error ("%qD declared % in % function", - decl); + error_at (DECL_SOURCE_LOCATION (decl), + "%qD declared % in % function", + decl); else if (TREE_STATIC (decl)) - error ("%qD declared % in % function", decl); + error_at (DECL_SOURCE_LOCATION (decl), + "%qD declared % in % function", decl); else ok = true; if (!ok) @@ -8253,18 +8255,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 % allows dynamic initialization " - "and destruction"); + inform (dloc, "C++11 % allows dynamic " + "initialization and destruction"); informed = true; } return; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f512ed1ac11..29b3b835acc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-07 Paolo Carlini + + * g++.dg/diagnostic/constexpr1.C: New. + * g++.dg/diagnostic/thread1.C: Likewise. + 2019-01-07 Thomas Koenig Harald Anlauf Tobias Burnus diff --git a/gcc/testsuite/g++.dg/diagnostic/constexpr1.C b/gcc/testsuite/g++.dg/diagnostic/constexpr1.C new file mode 100644 index 00000000000..f029e86e076 --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/constexpr1.C @@ -0,0 +1,5 @@ +// { dg-do compile { target c++11 } } + +constexpr int foo() { thread_local int i __attribute__((unused)) {}; return 1; } // { dg-error "40:.i. declared .thread_local." } + +constexpr int bar() { static int i __attribute__((unused)) {}; return 1; } // { dg-error "34:.i. declared .static." } diff --git a/gcc/testsuite/g++.dg/diagnostic/thread1.C b/gcc/testsuite/g++.dg/diagnostic/thread1.C new file mode 100644 index 00000000000..a35d9975f2e --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/thread1.C @@ -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" } -- 2.30.2