Patchwork Fix PR tree-optimization/54669

login
register
mail settings
Submitter Eric Botcazou
Date Sept. 22, 2012, 8:30 p.m.
Message ID <2464442.KkiJcra08V@polaris>
Download mbox | patch
Permalink /patch/186159/
State New
Headers show

Comments

Eric Botcazou - Sept. 22, 2012, 8:30 p.m.
As demonstrated by the testcase, the new propagate_constants_for_unrolling can 
change the EH properties of a statement when it turns array accesses with 
variable index into array accesses with fixed index if -fnon-call-exception is 
enabled.

The proposed fix is to call maybe_clean_or_replace_eh_stmt on the modified 
statement.  There is already a call to cleanup_tree_cfg at the end so this 
should be sufficient.

Tested on x86-64/Linux, OK for the mainline?


2012-09-22  Eric Botcazou  <ebotcazou@adacore.com>

	PR tree-optimization/54669
	* tree-ssa-loop-ivcanon.c (propagate_into_all_uses): Invoke
	maybe_clean_or_replace_eh_stmt on the modified use statements.


2012-09-22  Eric Botcazou  <ebotcazou@adacore.com>

	* gcc.dg/pr54669.c: New test.
Richard Guenther - Sept. 23, 2012, 4:27 p.m.
On Sat, Sep 22, 2012 at 10:30 PM, Eric Botcazou <ebotcazou@adacore.com> wrote:
> As demonstrated by the testcase, the new propagate_constants_for_unrolling can
> change the EH properties of a statement when it turns array accesses with
> variable index into array accesses with fixed index if -fnon-call-exception is
> enabled.
>
> The proposed fix is to call maybe_clean_or_replace_eh_stmt on the modified
> statement.  There is already a call to cleanup_tree_cfg at the end so this
> should be sufficient.
>
> Tested on x86-64/Linux, OK for the mainline?

Ok.

Thanks,
Richard.

>
> 2012-09-22  Eric Botcazou  <ebotcazou@adacore.com>
>
>         PR tree-optimization/54669
>         * tree-ssa-loop-ivcanon.c (propagate_into_all_uses): Invoke
>         maybe_clean_or_replace_eh_stmt on the modified use statements.
>
>
> 2012-09-22  Eric Botcazou  <ebotcazou@adacore.com>
>
>         * gcc.dg/pr54669.c: New test.
>
>
> --
> Eric Botcazou

Patch

Index: tree-ssa-loop-ivcanon.c
===================================================================
--- tree-ssa-loop-ivcanon.c	(revision 191387)
+++ tree-ssa-loop-ivcanon.c	(working copy)
@@ -531,6 +531,7 @@  propagate_into_all_uses (tree ssa_name,
 
       fold_stmt_inplace (&use_stmt_gsi);
       update_stmt (use_stmt);
+      maybe_clean_or_replace_eh_stmt (use_stmt, use_stmt);
     }
 }