re PR ipa/67811 ([TM] ICE with try-block in transaction)
authorRichard Henderson <rth@redhat.com>
Tue, 22 Dec 2015 19:42:24 +0000 (11:42 -0800)
committerRichard Henderson <rth@gcc.gnu.org>
Tue, 22 Dec 2015 19:42:24 +0000 (11:42 -0800)
commit7c11b0fef088480510a74f0f43015776c40be047
treea8d42a55a283fef873d7bbbede9d1387b48f417a
parentebe9921f0ce92a25657dee9e7913b944db8f0271
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
16 files changed:
gcc/ChangeLog
gcc/gimple-pretty-print.c
gcc/gimple-streamer-in.c
gcc/gimple-streamer-out.c
gcc/gimple-walk.c
gcc/gimple.c
gcc/gimple.h
gcc/gimplify.c
gcc/testsuite/ChangeLog
gcc/testsuite/g++.dg/tm/noexcept-1.C
gcc/testsuite/g++.dg/tm/noexcept-4.C
gcc/testsuite/g++.dg/tm/noexcept-5.C
gcc/testsuite/g++.dg/tm/pr67811.C [new file with mode: 0644]
gcc/trans-mem.c
gcc/tree-cfg.c
gcc/tree-inline.c