From: Paolo Carlini <paolo.carlini@oracle.com>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Cc: Jason Merrill <jason@redhat.com>
Subject: [C++ Patch] Fix four more locations
Date: Mon, 07 Jan 2019 17:08:00 -0000 [thread overview]
Message-ID: <e1b65b04-ede0-edc1-dbc2-f764ae5d56fa@oracle.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 112 bytes --]
Hi,
should be straightforward material. Tested x86_64-linux, as usual.
Thanks, Paolo.
/////////////////////
[-- Attachment #2: CL_locs_20 --]
[-- Type: text/plain, Size: 297 bytes --]
/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.
[-- Attachment #3: patch_locs_20 --]
[-- Type: text/plain, Size: 2855 bytes --]
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" }
next reply other threads:[~2019-01-07 17:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 17:08 Paolo Carlini [this message]
2019-01-07 19:21 ` Jason Merrill
2019-01-08 10:25 ` Christophe Lyon
2019-01-08 11:49 ` Paolo Carlini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e1b65b04-ede0-edc1-dbc2-f764ae5d56fa@oracle.com \
--to=paolo.carlini@oracle.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).