diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2017-01-05 01:46:14 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2017-01-05 01:46:14 +0000 |
| commit | 556655048b30188a560f135ccde732bc436eded2 (patch) | |
| tree | 97d67deb2126d6cba12c2c7c06b78b0d37401d62 | |
| parent | 692216906ba1c7734183c4940122d5684c05141f (diff) | |
| download | gcc-556655048b30188a560f135ccde732bc436eded2.zip gcc-556655048b30188a560f135ccde732bc436eded2.tar.gz gcc-556655048b30188a560f135ccde732bc436eded2.tar.bz2 | |
[-fcompare-debug] skip more debug stmts in cleanup_empty_eh
Various Ada RTS files failed -fcompare-debug compilation because debug
stmts prevented EH cleanups from taking place. Adjusting
cleanup_empty_eh to skip them fixes it.
for gcc/ChangeLog
* gimple-iterator.h (gsi_one_nondebug_before_end_p): New.
* tree-eh.c (cleanup_empty_eh): Skip more debug stmts.
From-SVN: r244088
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/gimple-iterator.h | 14 | ||||
| -rw-r--r-- | gcc/tree-eh.c | 7 |
3 files changed, 23 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2582f48..6f26a7a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2017-01-04 Alexandre Oliva <aoliva@redhat.com> + * gimple-iterator.h (gsi_one_nondebug_before_end_p): New. + * tree-eh.c (cleanup_empty_eh): Skip more debug stmts. + +2017-01-04 Alexandre Oliva <aoliva@redhat.com> + * multiple_target.c (create_dispatcher_calls): Init e_next. * tree-ssa-loop-split.c (split_loop): Init border. * tree-vect-loop.c (vect_determine_vectorization_factor): Init diff --git a/gcc/gimple-iterator.h b/gcc/gimple-iterator.h index 7b2c49c..70f18be 100644 --- a/gcc/gimple-iterator.h +++ b/gcc/gimple-iterator.h @@ -305,6 +305,20 @@ gsi_last_nondebug_bb (basic_block bb) return i; } +/* Return true if I is followed only by debug statements in its + sequence. */ + +static inline bool +gsi_one_nondebug_before_end_p (gimple_stmt_iterator i) +{ + if (gsi_one_before_end_p (i)) + return true; + if (gsi_end_p (i)) + return false; + gsi_next_nondebug (&i); + return gsi_end_p (i); +} + /* Iterates I statement iterator to the next non-virtual statement. */ static inline void diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index 2be4312..45e6b9e4 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -4382,7 +4382,8 @@ cleanup_empty_eh (eh_landing_pad lp) return false; } - resx = last_stmt (bb); + gsi = gsi_last_nondebug_bb (bb); + resx = gsi_stmt (gsi); if (resx && is_gimple_resx (resx)) { if (stmt_can_throw_external (resx)) @@ -4416,12 +4417,12 @@ cleanup_empty_eh (eh_landing_pad lp) resx = gsi_stmt (gsi); if (!e_out && gimple_call_builtin_p (resx, BUILT_IN_STACK_RESTORE)) { - gsi_next (&gsi); + gsi_next_nondebug (&gsi); resx = gsi_stmt (gsi); } if (!is_gimple_resx (resx)) return ret; - gcc_assert (gsi_one_before_end_p (gsi)); + gcc_assert (gsi_one_nondebug_before_end_p (gsi)); /* Determine if there are non-EH edges, or resx edges into the handler. */ has_non_eh_pred = false; |