public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/c++-modules] c: Fix up cfun->function_end_locus on invalid function bodies [PR94239]
@ 2020-03-27 13:45 Nathan Sidwell
0 siblings, 0 replies; only message in thread
From: Nathan Sidwell @ 2020-03-27 13:45 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:5db9e89323cd0a0be16a94f2f984121531ea7772
commit 5db9e89323cd0a0be16a94f2f984121531ea7772
Author: Jakub Jelinek <jakub@redhat.com>
Date: Mon Mar 23 19:44:58 2020 +0100
c: Fix up cfun->function_end_locus on invalid function bodies [PR94239]
Unfortunately the patch broke
+FAIL: gcc.dg/pr20245-1.c (internal compiler error)
+FAIL: gcc.dg/pr20245-1.c (test for excess errors)
+FAIL: gcc.dg/pr28419.c (internal compiler error)
+FAIL: gcc.dg/pr28419.c (test for excess errors)
on some targets (and under valgrind on the rest of them).
Those functions don't have the opening { and so c_parser_compound_statement
returned error_mark_node before initializing *endlocp.
So, either we can initialize it in that case too:
--- gcc/c/c-parser.c 2020-03-20 22:09:39.659411721 +0100
+++ gcc/c/c-parser.c 2020-03-21 09:36:44.455705261 +0100
@@ -5611,6 +5611,8 @@ c_parser_compound_statement (c_parser *p
if we have just prepared to enter a function body. */
stmt = c_begin_compound_stmt (true);
c_end_compound_stmt (brace_loc, stmt, true);
+ if (endlocp)
+ *endlocp = brace_loc;
return error_mark_node;
}
stmt = c_begin_compound_stmt (true);
or perhaps simpler initialize it to the function_start_locus at the
beginning and have those functions without { have function_start_locus ==
function_end_locus like the __GIMPLE functions (where propagating the
closing } seemed too difficult).
2020-03-23 Jakub Jelinek <jakub@redhat.com>
PR gcov-profile/94029
PR c/94239
* c-parser.c (c_parser_declaration_or_fndef): Initialize endloc to
the function_start_locus location. Don't do that afterwards for the
__GIMPLE body parsing.
Diff:
---
gcc/c/ChangeLog | 8 ++++++++
gcc/c/c-parser.c | 7 +++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c0b65a5b91d..a3350c2b9d1 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-23 Jakub Jelinek <jakub@redhat.com>
+
+ PR gcov-profile/94029
+ PR c/94239
+ * c-parser.c (c_parser_declaration_or_fndef): Initialize endloc to
+ the function_start_locus location. Don't do that afterwards for the
+ __GIMPLE body parsing.
+
2020-03-19 Jakub Jelinek <jakub@redhat.com>
PR gcov-profile/94029
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 4b068a938fb..aeeac8c5f21 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -2469,9 +2469,10 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
omp_declare_simd_clauses);
if (oacc_routine_data)
c_finish_oacc_routine (oacc_routine_data, current_function_decl, true);
+ location_t startloc = c_parser_peek_token (parser)->location;
DECL_STRUCT_FUNCTION (current_function_decl)->function_start_locus
- = c_parser_peek_token (parser)->location;
- location_t endloc;
+ = startloc;
+ location_t endloc = startloc;
/* If the definition was marked with __RTL, use the RTL parser now,
consuming the function body. */
@@ -2499,8 +2500,6 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
specs->declspec_il,
specs->entry_bb_count);
in_late_binary_op = saved;
- struct function *fun = DECL_STRUCT_FUNCTION (current_function_decl);
- endloc = fun->function_start_locus;
}
else
fnbody = c_parser_compound_statement (parser, &endloc);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-27 13:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-27 13:45 [gcc/devel/c++-modules] c: Fix up cfun->function_end_locus on invalid function bodies [PR94239] Nathan Sidwell
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).