mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 03:50:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR middle-end/60004 (Conditional return within transaction causes ICE)

Browse Source 
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
This commit is contained in:
Richard Henderson 2014-01-31 11:35:31 -08:00 committed by Richard Henderson
parent 3d27e0669d
commit efa7882fa6
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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),

4
gcc/testsuite/ChangeLog
View File

@ -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

10
gcc/testsuite/g++.dg/tm/pr60004.C Normal file
View File

@ -0,0 +1,10 @@
// { dg-do compile }
// { dg-options "-fgnu-tm" }
int a;
int f() {
__transaction_atomic {
if (a == 5)
return 1;
}
}

4
gcc/tree-eh.c
View File

@ -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. */