From 6549bdc6beb08b4d5737415b1ed97081e7a900d3 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 23 Dec 2015 16:45:15 -0800 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/tree-cfg.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index addc54af887..6bc47d56f75 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-23 Richard Henderson + + PR ipa/67811 + * tree-cfg.c (make_edges_bb): Add abort edge for outer transactions. + 2015-12-23 Nathan Sidwell * cgraph.h (decl_in_symtab_p): Revert check DECL_IN_CONSTANT_POOL. diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 436ea146c1b..3b2fab56e95 100644 --- 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; -- 2.30.2