diff options
| author | Richard Henderson <rth@redhat.com> | 2015-12-22 11:42:24 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2015-12-22 11:42:24 -0800 |
| commit | 7c11b0fef088480510a74f0f43015776c40be047 (patch) | |
| tree | a8d42a55a283fef873d7bbbede9d1387b48f417a /gcc/tree-inline.c | |
| parent | ebe9921f0ce92a25657dee9e7913b944db8f0271 (diff) | |
| download | gcc-7c11b0fef088480510a74f0f43015776c40be047.zip gcc-7c11b0fef088480510a74f0f43015776c40be047.tar.gz gcc-7c11b0fef088480510a74f0f43015776c40be047.tar.bz2 | |
re PR ipa/67811 ([TM] ICE with try-block in transaction)
PR ipa/67811
* gimple.h (struct gtransaction): Add label_norm, label_uninst;
replace label with label_over.
(gimple_build_transaction): Remove label parameter.
(gimple_transaction_label_norm): New.
(gimple_transaction_label_uninst): New.
(gimple_transaction_label_over): Rename from gimple_transaction_label.
(gimple_transaction_label_norm_ptr): New.
(gimple_transaction_label_uninst_ptr): New.
(gimple_transaction_label_over_ptr): Rename from
gimple_transaction_label_ptr.
(gimple_transaction_set_label_norm): New.
(gimple_transaction_set_label_uninst): New.
(gimple_transaction_set_label_over): Rename from
gimple_transaction_set_label.
* gimple-pretty-print.c (dump_gimple_transaction): Update.
* gimple-streamer-in.c (input_gimple_stmt) [GIMPLE_TRANSACTION]: Same.
* gimple-streamer-out.c (output_gimple_stmt) [GIMPLE_TRANSACTION]: Same.
* gimple-walk.c (walk_gimple_op) [GIMPLE_TRANSACTION]: Same.
* tree-cfg.c (make_edges_bb) [GIMPLE_TRANSACTION]: Same.
(cleanup_dead_labels) [GIMPLE_TRANSACTION]: Same.
(verify_gimple_transaction): Same.
(gimple_redirect_edge_and_branch) [GIMPLE_TRANSACTION]: Same.
* tree-inline.c (remap_gimple_stmt) [GIMPLE_TRANSACTION]: Same.
* gimple.c (gimple_build_transaction): Remove label parameter;
initialize all three label memebers.
* gimplify.c (gimplify_transaction): Update call
to gimple_build_transaction.
* trans-mem.c (make_tm_uninst): New.
(lower_transaction): Create uninstrumented code path here...
(ipa_tm_scan_calls_transaction): ... not here.
(ipa_uninstrument_transaction): Remove.
testsuite/
* g++.dg/tm/noexcept-1.C: Update expected must_not_throw count.
* g++.dg/tm/noexcept-4.C: Likewise.
* g++.dg/tm/noexcept-5.C: Likewise.
* g++.dg/tm/pr67811.C: New.
From-SVN: r231907
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 36c96225..88a6753 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1518,13 +1518,15 @@ remap_gimple_stmt (gimple *stmt, copy_body_data *id) gtransaction *new_trans_stmt; s1 = remap_gimple_seq (gimple_transaction_body (old_trans_stmt), id); - copy = new_trans_stmt - = gimple_build_transaction ( - s1, - gimple_transaction_label (old_trans_stmt)); - gimple_transaction_set_subcode ( - new_trans_stmt, + copy = new_trans_stmt = gimple_build_transaction (s1); + gimple_transaction_set_subcode (new_trans_stmt, gimple_transaction_subcode (old_trans_stmt)); + gimple_transaction_set_label_norm (new_trans_stmt, + gimple_transaction_label_norm (old_trans_stmt)); + gimple_transaction_set_label_uninst (new_trans_stmt, + gimple_transaction_label_uninst (old_trans_stmt)); + gimple_transaction_set_label_over (new_trans_stmt, + gimple_transaction_label_over (old_trans_stmt)); } break; |