| Message ID | 56F405DB.1060600@redhat.com |
|---|---|
| State | New |
| Headers | show |
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 <bschmidt@redhat.com> >> 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 (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. >> >> After some more digging and looking at your patch I'd approve that if >> it would >> emit a warning rather than an error - so can you please adjust it? > > 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 > > cpp-leave.diff > > > PR lto/69650 > * directives.c (do_linemarker): Test for file left but not entered > here. > * line-map.c (linemap_add): Not here. > > PR lto/69650 > * gcc.dg/pr69650.c: New test. OK. Also OK if you want to fixup the message. jeff
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 >> >> cpp-leave.diff >> >> >> PR lto/69650 >> * directives.c (do_linemarker): Test for file left but not entered >> here. >> * line-map.c (linemap_add): Not here. >> >> PR lto/69650 >> * gcc.dg/pr69650.c: New test. > OK. > > Also OK if you want to fixup the message. And I just realized Bernd is out due to the holidays, so I went ahead and committed this for him. jeff
PR lto/69650 * directives.c (do_linemarker): Test for file left but not entered here. * line-map.c (linemap_add): Not here. PR lto/69650 * gcc.dg/pr69650.c: New test. Index: gcc/testsuite/gcc.dg/pr69650.c =================================================================== --- gcc/testsuite/gcc.dg/pr69650.c (revision 0) +++ gcc/testsuite/gcc.dg/pr69650.c (working copy) @@ -0,0 +1,5 @@ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99" } */ + +# 9 "somefile" 2 /* { dg-warning "left but not entered" } */ +not_a_type a; /* { dg-error "unknown type" } */ Index: libcpp/directives.c =================================================================== --- libcpp/directives.c (revision 234341) +++ libcpp/directives.c (working copy) @@ -1046,6 +1046,19 @@ skip_rest_of_line (pfile); + if (reason == LC_LEAVE) + { + const line_map_ordinary *from; + if (MAIN_FILE_P (map) + || (new_file + && (from = INCLUDED_FROM (pfile->line_table, map)) != NULL + && filename_cmp (ORDINARY_MAP_FILE_NAME (from), new_file) != 0)) + { + cpp_warning (pfile, CPP_W_NONE, + "file \"%s\" left but not entered", new_file); + return; + } + } /* Compensate for the increment in linemap_add that occurs in _cpp_do_file_change. We're currently at the start of the line *following* the #line directive. A separate source_location for this Index: libcpp/line-map.c =================================================================== --- libcpp/line-map.c (revision 234341) +++ libcpp/line-map.c (working copy) @@ -512,43 +512,23 @@ "included", this variable points the map in use right before the #include "included", inside the same "includer" file. */ line_map_ordinary *from; - bool error; - if (MAIN_FILE_P (map - 1)) - { - /* So this _should_ mean we are leaving the main file -- - effectively ending the compilation unit. But to_file not - being NULL means the caller thinks we are leaving to - another file. This is an erroneous behaviour but we'll - try to recover from it. Let's pretend we are not leaving - the main file. */ - error = true; - reason = LC_RENAME; - from = map - 1; - } - else - { - /* (MAP - 1) points to the map we are leaving. The - map from which (MAP - 1) got included should be the map - that comes right before MAP in the same file. */ - from = INCLUDED_FROM (set, map - 1); - error = to_file && filename_cmp (ORDINARY_MAP_FILE_NAME (from), - to_file); - } + linemap_assert (!MAIN_FILE_P (map - 1)); + /* (MAP - 1) points to the map we are leaving. The + map from which (MAP - 1) got included should be the map + that comes right before MAP in the same file. */ + from = INCLUDED_FROM (set, map - 1); - /* Depending upon whether we are handling preprocessed input or - not, this can be a user error or an ICE. */ - if (error) - fprintf (stderr, "line-map.c: file \"%s\" left but not entered\n", - 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); sysp = ORDINARY_MAP_IN_SYSTEM_HEADER_P (from); } + else + linemap_assert (filename_cmp (ORDINARY_MAP_FILE_NAME (from), + to_file) == 0); } map->sysp = sysp;