diff options
| author | Richard Henderson <rth@redhat.com> | 2014-01-31 11:35:31 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2014-01-31 11:35:31 -0800 |
| commit | efa7882fa699212d9d5417df3e39882e831eacbb (patch) | |
| tree | 7563625dd4f7cf06cb8dbd4f8104cb41a0e72fdd /gcc | |
| parent | 3d27e0669d807f01a93a03209f8cbb3c3f85d032 (diff) | |
| download | gcc-efa7882fa699212d9d5417df3e39882e831eacbb.zip gcc-efa7882fa699212d9d5417df3e39882e831eacbb.tar.gz gcc-efa7882fa699212d9d5417df3e39882e831eacbb.tar.bz2 | |
re PR middle-end/60004 (Conditional return within transaction causes ICE)
PR middle-end/60004
* tree-eh.c (lower_try_finally_switch): Delay lowering finally block
until after else_eh is processed.
* g++.dg/tm/pr60004.C: New.
From-SVN: r207367
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tm/pr60004.C | 10 | ||||
| -rw-r--r-- | gcc/tree-eh.c | 4 |
4 files changed, 21 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 621a344..93ebbb9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-01-31 Richard Henderson <rth@redhat.com> + + PR middle-end/60004 + * tree-eh.c (lower_try_finally_switch): Delay lowering finally block + until after else_eh is processed. + 2014-01-31 Ilya Tocar <ilya.tocar@intel.com> * config/i386/avx512fintrin.h (_MM_FROUND_TO_NEAREST_INT), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fca54d7..014dc08 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-01-31 Richard Henderson <rth@redhat.com> + + * g++.dg/tm/pr60004.C: New. + 2014-01-31 Paolo Carlini <paolo.carlini@oracle.com> PR c++/59082 diff --git a/gcc/testsuite/g++.dg/tm/pr60004.C b/gcc/testsuite/g++.dg/tm/pr60004.C new file mode 100644 index 0000000..b8c2c0e --- /dev/null +++ b/gcc/testsuite/g++.dg/tm/pr60004.C @@ -0,0 +1,10 @@ +// { dg-do compile } +// { dg-options "-fgnu-tm" } + +int a; +int f() { + __transaction_atomic { + if (a == 5) + return 1; + } +} diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index 0c8282e..e9c714c 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -1388,9 +1388,6 @@ lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf) x = gimple_seq_last_stmt (finally); finally_loc = x ? gimple_location (x) : tf_loc; - /* Lower the finally block itself. */ - lower_eh_constructs_1 (state, &finally); - /* Prepare for switch statement generation. */ nlabels = tf->dest_array.length (); return_index = nlabels; @@ -1476,6 +1473,7 @@ lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf) x = gimple_build_label (finally_label); gimple_seq_add_stmt (&tf->top_p_seq, x); + lower_eh_constructs_1 (state, &finally); gimple_seq_add_seq (&tf->top_p_seq, finally); /* Redirect each incoming goto edge. */ |