re PR c/92249 (ICE in c_parser_gimple_compound_statement w/ GIMPLE testcases)

2019-10-28  Richard Biener  <rguenther@suse.de>

	PR c/92249
	* gimple-parser.c (c_parser_parse_gimple_body): Make
	current_bb the entry block initially to easier recover
	from errors.
	(c_parser_gimple_compound_statement): Adjust.

From-SVN: r277512

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index e8518f27494a65994ebae307b380a50c42c1fb55..4b0511888b2d2056d5fd78219063e79ec104a62e 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-28  Richard Biener  <rguenther@suse.de>
+
+       PR c/92249
+       * gimple-parser.c (c_parser_parse_gimple_body): Make
+       current_bb the entry block initially to easier recover
+       from errors.
+       (c_parser_gimple_compound_statement): Adjust.
+
 2019-10-24  Jakub Jelinek  <jakub@redhat.com>
 
        * c-parser.c (c_finish_omp_declare_variant): Use

diff --git a/gcc/c/gimple-parser.c b/gcc/c/gimple-parser.c
index 3f575992d327db9e589293631b9fc3626e661bae..d8588d4746226089db5446c358f5438d04b46f41 100644 (file)
--- a/gcc/c/gimple-parser.c
+++ b/gcc/c/gimple-parser.c
@@ -235,6 +235,7 @@ c_parser_parse_gimple_body (c_parser *cparser, char *gimple_pass,
       /* We have at least cdil_gimple_cfg.  */
       gimple_register_cfg_hooks ();
       init_empty_tree_cfg ();
+      parser.current_bb = ENTRY_BLOCK_PTR_FOR_FN (cfun);
       /* Initialize the bare loop structure - we are going to only
          mark headers and leave the rest to fixup.  */
       set_loops_for_fn (cfun, ggc_cleared_alloc<struct loops> ());
@@ -594,7 +595,7 @@ c_parser_gimple_compound_statement (gimple_parser &parser, gimple_seq *seq)
              if (last_basic_block_for_fn (cfun) <= index)
                last_basic_block_for_fn (cfun) = index + 1;
              n_basic_blocks_for_fn (cfun)++;
-             if (!parser.current_bb)
+             if (parser.current_bb->index == ENTRY_BLOCK)
                parser.push_edge (ENTRY_BLOCK, bb->index, EDGE_FALLTHRU,
                                  profile_probability::always ());