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 --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c0b65a5b91d368bfdaa204da5684b5318870f2a5..a3350c2b9d18fb20fef294db53d9fde3e36eafcb 100644 (file)
--- 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 4b068a938fbfbd1aca7e42f547d29d276bdc18e3..aeeac8c5f21b16d7f9fd284fbe3e77de829639e7 100644 (file)
--- 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);