This restores the post-order traversal done by cleanup_all_empty_eh in
order to eliminate empty landing pads and also contains a small tweak
to the line debug info to avoid a problematic inheritance for coverage
measurement.
gcc/ChangeLog:
* tree-eh.c (lower_try_finally_dup_block): Backward propagate slocs
to stack restore builtin calls.
(cleanup_all_empty_eh): Do again a post-order traversal of the EH
region tree.
gcc/testsuite/ChangeLog:
* gnat.dg/concat4.adb: New test.
--- /dev/null
+-- { dg-do compile }
+
+with Ada.Text_IO; use Ada.Text_IO;
+
+procedure Concat4 (X : Integer) is
+ Ximg : constant String := Integer'Image (X);
+begin
+ if X > 0 then
+ Put_Line (Ximg & " is Positive");
+ elsif X < 0 then
+ Put_Line (Ximg & " is Negative");
+ else
+ Put_Line (Ximg & " is Null");
+ end if;
+end;
+
+-- { dg-final { scan-assembler-not "_Unwind_Resume" } }
gtry *region = NULL;
gimple_seq new_seq;
gimple_stmt_iterator gsi;
gtry *region = NULL;
gimple_seq new_seq;
gimple_stmt_iterator gsi;
+ location_t last_loc = UNKNOWN_LOCATION;
new_seq = copy_gimple_seq_and_replace_locals (seq);
new_seq = copy_gimple_seq_and_replace_locals (seq);
- for (gsi = gsi_start (new_seq); !gsi_end_p (gsi); gsi_next (&gsi))
+ for (gsi = gsi_last (new_seq); !gsi_end_p (gsi); gsi_prev (&gsi))
{
gimple *stmt = gsi_stmt (gsi);
/* We duplicate __builtin_stack_restore at -O0 in the hope of eliminating
{
gimple *stmt = gsi_stmt (gsi);
/* We duplicate __builtin_stack_restore at -O0 in the hope of eliminating
- it on the EH paths. When it is not eliminated, make it transparent in
- the debug info. */
+ it on the EH paths. When it is not eliminated, give it the next
+ location in the sequence or make it transparent in the debug info. */
if (gimple_call_builtin_p (stmt, BUILT_IN_STACK_RESTORE))
if (gimple_call_builtin_p (stmt, BUILT_IN_STACK_RESTORE))
- gimple_set_location (stmt, UNKNOWN_LOCATION);
+ gimple_set_location (stmt, last_loc);
else if (LOCATION_LOCUS (gimple_location (stmt)) == UNKNOWN_LOCATION)
{
tree block = gimple_block (stmt);
gimple_set_location (stmt, loc);
gimple_set_block (stmt, block);
}
else if (LOCATION_LOCUS (gimple_location (stmt)) == UNKNOWN_LOCATION)
{
tree block = gimple_block (stmt);
gimple_set_location (stmt, loc);
gimple_set_block (stmt, block);
}
+ else
+ last_loc = gimple_location (stmt);
eh_landing_pad lp;
int i;
eh_landing_pad lp;
int i;
- /* Ideally we'd walk the region tree and process LPs inner to outer
- to avoid quadraticness in EH redirection. Walking the LP array
- in reverse seems to be an approximation of that. */
+ /* The post-order traversal may lead to quadraticness in the redirection
+ of incoming EH edges from inner LPs, so first try to walk the region
+ tree from inner to outer LPs in order to eliminate these edges. */
for (i = vec_safe_length (cfun->eh->lp_array) - 1; i >= 1; --i)
{
lp = (*cfun->eh->lp_array)[i];
for (i = vec_safe_length (cfun->eh->lp_array) - 1; i >= 1; --i)
{
lp = (*cfun->eh->lp_array)[i];
changed |= cleanup_empty_eh (lp);
}
changed |= cleanup_empty_eh (lp);
}
+ /* Now do the post-order traversal to eliminate outer empty LPs. */
+ for (i = 1; vec_safe_iterate (cfun->eh->lp_array, i, &lp); ++i)
+ if (lp)
+ changed |= cleanup_empty_eh (lp);
+