Re: Fix 69650, bogus line numbers from libcpp

2016-03-25 Thread Jeff Law
On 03/24/2016 03:25 PM, Jeff Law wrote: On 03/24/2016 09:20 AM, Bernd Schmidt wrote: Like this? No one has yet approved any better wording for the message, so given that you said "it's not a regression" I've left it, but I would now prefer "linemarker ignored due to incorrect nesting". Bernd

Re: Fix 69650, bogus line numbers from libcpp

2016-03-24 Thread Jeff Law
On 03/24/2016 09:20 AM, Bernd Schmidt wrote: On 03/23/2016 03:21 PM, Richard Biener wrote: On Wed, Mar 23, 2016 at 2:15 PM, Bernd Schmidt wrote: 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

Re: Fix 69650, bogus line numbers from libcpp

2016-03-24 Thread Bernd Schmidt
On 03/23/2016 03:21 PM, Richard Biener wrote: On Wed, Mar 23, 2016 at 2:15 PM, Bernd Schmidt wrote: 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 ==

Re: Fix 69650, bogus line numbers from libcpp

2016-03-23 Thread Richard Biener
On Wed, Mar 23, 2016 at 2:15 PM, Bernd Schmidt wrote: > 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 (revisio

Re: Fix 69650, bogus line numbers from libcpp

2016-03-23 Thread Bernd Schmidt
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 @@ lin

Re: Fix 69650, bogus line numbers from libcpp

2016-03-23 Thread Richard Biener
On Mon, Mar 21, 2016 at 11:58 PM, Bernd Schmidt wrote: > On 03/21/2016 09:15 PM, David Malcolm wrote: >> >> On Mon, 2016-03-14 at 14:20 +0100, Bernd Schmidt wrote: >>> >>> On 03/11/2016 11:09 PM, David Malcolm wrote: > > + cpp_error (pfile, CPP_DL_ERROR, > +

Re: Fix 69650, bogus line numbers from libcpp

2016-03-21 Thread Bernd Schmidt
On 03/21/2016 09:15 PM, David Malcolm wrote: On Mon, 2016-03-14 at 14:20 +0100, Bernd Schmidt wrote: On 03/11/2016 11:09 PM, David Malcolm wrote: + cpp_error (pfile, CPP_DL_ERROR, +"file \"%s\" left but not entered", new_file);

Re: Fix 69650, bogus line numbers from libcpp

2016-03-21 Thread David Malcolm
On Mon, 2016-03-14 at 14:20 +0100, Bernd Schmidt wrote: > On 03/11/2016 11:09 PM, David Malcolm wrote: > > > + cpp_error (pfile, CPP_DL_ERROR, > > > + "file \"%s\" left but not entered", > > > new_file); > > > > Altho

Re: Fix 69650, bogus line numbers from libcpp

2016-03-21 Thread Bernd Schmidt
Ping. Bernd On 03/14/2016 02:20 PM, Bernd Schmidt wrote: On 03/11/2016 11:09 PM, David Malcolm wrote: + cpp_error (pfile, CPP_DL_ERROR, + "file \"%s\" left but not entered", new_file); Although it looks like

Re: Fix 69650, bogus line numbers from libcpp

2016-03-14 Thread Bernd Schmidt
On 03/11/2016 11:09 PM, David Malcolm wrote: + cpp_error (pfile, CPP_DL_ERROR, +"file \"%s\" left but not entered", new_file); Although it looks like you're preserving the existing behavior from when t

Re: Fix 69650, bogus line numbers from libcpp

2016-03-11 Thread David Malcolm
On Thu, 2016-03-10 at 09:40 +0100, Bernd Schmidt wrote: > This is a case where bogus #line directives can confuse libcpp into > producing nonsensical line numbers, even leading to a crash later on > in LTO. > > The following patch moves the test earlier to a point where we can > more > easily re

Fix 69650, bogus line numbers from libcpp

2016-03-10 Thread Bernd Schmidt
This is a case where bogus #line directives can confuse libcpp into producing nonsensical line numbers, even leading to a crash later on in LTO. The following patch moves the test earlier to a point where we can more easily recover from the error condition. I should note that I changed the raw