public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Bernd Schmidt <bschmidt@redhat.com>
To: Richard Biener <richard.guenther@gmail.com>
Cc: David Malcolm <dmalcolm@redhat.com>,
	GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: Fix 69650, bogus line numbers from libcpp
Date: Wed, 23 Mar 2016 13:21:00 -0000	[thread overview]
Message-ID: <56F296D5.8050204@redhat.com> (raw)
In-Reply-To: <CAFiYyc0dLpM_zwRB2JJVySY3NwKhaYKxr9DTSS=smjO84ioKxg@mail.gmail.com>

On 03/23/2016 01:41 PM, Richard Biener wrote:
> Btw, the issue in the PR is also fixed with a simple
>
> Index: libcpp/line-map.c
> ===================================================================
> --- libcpp/line-map.c   (revision 234415)
> +++ libcpp/line-map.c   (working copy)
> @@ -543,7 +543,7 @@ linemap_add (struct line_maps *set, enum
>                   to_file);
>
>         /* A TO_FILE of NULL is special - we use the natural values.  */
> -      if (error || to_file == NULL)
> +      if (to_file == NULL)
>          {
>            to_file = ORDINARY_MAP_FILE_NAME (from);
>            to_line = SOURCE_LINE (from, from[1].start_location);

I looked at that, but that made it hard to add the testcase as the line 
numbers no longer match the dg-error directives. By moving this code we 
can ignore the erroneous #line directive, and for this one testcase at 
least, that makes the line numbers (and caret diagnostics etc.) come out 
right.


Bernd

  reply	other threads:[~2016-03-23 13:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <56E12FFF.6050800@t-online.de>
2016-03-10  8:40 ` Bernd Schmidt
2016-03-11 22:09   ` David Malcolm
2016-03-14 13:20     ` Bernd Schmidt
2016-03-21 14:58       ` Bernd Schmidt
2016-03-21 20:17       ` David Malcolm
2016-03-22  1:35         ` Bernd Schmidt
2016-03-23 12:58           ` Richard Biener
2016-03-23 13:21             ` Bernd Schmidt [this message]
2016-03-23 14:39               ` Richard Biener
2016-03-24 16:21                 ` Bernd Schmidt
2016-03-24 21:42                   ` Jeff Law
2016-03-25 18:25                     ` Jeff Law

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=56F296D5.8050204@redhat.com \
    --to=bschmidt@redhat.com \
    --cc=dmalcolm@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=richard.guenther@gmail.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).