From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20022 invoked by alias); 24 Mar 2014 11:29:27 -0000 Mailing-List: contact jit-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: Sender: jit-owner@gcc.gnu.org Received: (qmail 19998 invoked by uid 89); 24 Mar 2014 11:29:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.98.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com From: Tom Tromey To: David Malcolm Cc: jit@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: [RFA jit] initialize input_location References: <1395327187-14524-1-git-send-email-tromey@redhat.com> <1395440318.10979.10.camel@surprise> X-Attribution: Tom Date: Wed, 01 Jan 2014 00:00:00 -0000 In-Reply-To: <1395440318.10979.10.camel@surprise> (David Malcolm's message of "Fri, 21 Mar 2014 18:18:38 -0400") Message-ID: <874n2nx2b2.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-SW-Source: 2014-q1/txt/msg00096.txt.bz2 >>>>> "Dave" == David Malcolm 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 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 + + * toplev.c (general_init): Initialize input_location. + * input.c (input_location): Initialize to UNKNOWN_LOCATION. + 2014-03-19 Tom Tromey * 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;