From: Tom Tromey <tromey@redhat.com>
To: David Malcolm <dmalcolm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: jit@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: Re: [RFA jit] initialize input_location
Date: Wed, 01 Jan 2014 00:00:00 -0000 [thread overview]
Message-ID: <874n2nx2b2.fsf@fleche.redhat.com> (raw)
In-Reply-To: <1395440318.10979.10.camel@surprise> (David Malcolm's message of "Fri, 21 Mar 2014 18:18:38 -0400")
>>>>> "Dave" == David Malcolm <dmalcolm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> writes:
Dave> Given this declaration in input.c:
Dave> location_t input_location;
Dave> then assigning 0 is a faithful way of resetting it to its initial state.
Dave> That said, "0" feels like a magic number. Would it better to assign
Dave> UNKNOWN_LOCATION to it? which is 0, c.f. input.h:
Dave> #define UNKNOWN_LOCATION ((source_location) 0)
Dave> If so, perhaps the declaration in input.c should gain an initializer to
Dave> the same value? (shouldn't affect the code, since it's 0 either way,
Dave> but perhaps it's more readable?)
Sounds reasonable to me.
How about the appended?
Tom
commit 79ce51eaf41ce7b0e90407245b7cad33ada6887b
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Mar 20 08:51:25 2014 -0600
initialize input_location
This patch initializes input_location at the same spot where the line
table is initialized. Without this, it's possible to crash when
emitting a diagnostic in a reinvocation of the compiler, because
input_location refers to a location that is no longer valid.
diff --git a/gcc/ChangeLog.jit b/gcc/ChangeLog.jit
index ee1df88..5145cf9 100644
--- a/gcc/ChangeLog.jit
+++ b/gcc/ChangeLog.jit
@@ -1,3 +1,8 @@
+2014-03-24 Tom Tromey <tromey@redhat.com>
+
+ * toplev.c (general_init): Initialize input_location.
+ * input.c (input_location): Initialize to UNKNOWN_LOCATION.
+
2014-03-19 Tom Tromey <tromey@redhat.com>
* timevar.h (auto_timevar): New class.
diff --git a/gcc/input.c b/gcc/input.c
index a141a92..90a708c 100644
--- a/gcc/input.c
+++ b/gcc/input.c
@@ -1,5 +1,5 @@
/* Data and functions related to line maps and input files.
- Copyright (C) 2004-2013 Free Software Foundation, Inc.
+ Copyright (C) 2004-2014 Free Software Foundation, Inc.
This file is part of GCC.
@@ -25,7 +25,7 @@ along with GCC; see the file COPYING3. If not see
/* Current position in real source file. */
-location_t input_location;
+location_t input_location = UNKNOWN_LOCATION;
struct line_maps *line_table;
diff --git a/gcc/toplev.c b/gcc/toplev.c
index b257ab2..54a884e 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1161,6 +1161,7 @@ general_init (const char *argv0)
table. */
init_ggc ();
init_stringpool ();
+ input_location = UNKNOWN_LOCATION;
line_table = ggc_alloc_line_maps ();
linemap_init (line_table);
line_table->reallocator = realloc_for_line_map;
next prev parent reply other threads:[~2014-03-24 11:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-01 0:00 Tom Tromey
2014-01-01 0:00 ` David Malcolm
2014-01-01 0:00 ` Tom Tromey [this message]
2014-01-01 0:00 ` David Malcolm
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=874n2nx2b2.fsf@fleche.redhat.com \
--to=tromey@redhat.com \
--cc=dmalcolm-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=jit@gcc.gnu.org \
/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).