re PR ipa/67811 ([TM] ICE with try-block in transaction)

PR ipa/67811 * tree-cfg.c (make_edges_bb): Add abort edge for outer transactions. From-SVN: r231943

re PR ipa/67811 ([TM] ICE with try-block in transaction)
PR ipa/67811 * tree-cfg.c (make_edges_bb): Add abort edge for outer transactions. From-SVN: r231943
6549bdc6 · Richard Henderson · Richard Henderson · f89fc5c4 · 6549bdc6 · 6549bdc6
Commit 6549bdc6 authored Dec 23, 2015 by Richard Henderson Committed by Richard Henderson Dec 23, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletions

gcc/ChangeLog
+5 -0

gcc/tree-cfg.c
+2 -1

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+2015-12-23  Richard Henderson  <rth@redhat.com>
+
+	PR ipa/67811
+	* tree-cfg.c (make_edges_bb): Add abort edge for outer transactions.
+
 2015-12-23  Nathan Sidwell  <nathan@acm.org>

 	* cgraph.h (decl_in_symtab_p): Revert check DECL_IN_CONSTANT_POOL.
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -839,7 +839,8 @@ make_edges_bb (basic_block bb, struct omp_region **pcur_region, int *pomp_index)
 		     EDGE_TM_UNINSTRUMENTED | (label1 ? 0 : EDGE_FALLTHRU));

 	tree label3 = gimple_transaction_label_over (txn);
-	if (gimple_transaction_subcode (txn) & GTMA_HAVE_ABORT)
+	if (gimple_transaction_subcode (txn)
+	    & (GTMA_HAVE_ABORT | GTMA_IS_OUTER))
 	  make_edge (bb, label_to_block (label3), EDGE_TM_ABORT);

 	fallthru = false;