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/gimple.h | |
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/gimple.h')
-rw-r--r-- | gcc/gimple.h | 59 |
1 files changed, 48 insertions, 11 deletions
diff --git a/gcc/gimple.h b/gcc/gimple.h index dc61043..adfe071a 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -836,8 +836,10 @@ struct GTY((tag("GSS_TRANSACTION"))) /* [ WORD 10 ] */ gimple_seq body; - /* [ WORD 11 ] */ - tree label; + /* [ WORD 11-13 ] */ + tree label_norm; + tree label_uninst; + tree label_over; }; #define DEFGSSTRUCT(SYM, STRUCT, HAS_TREE_OP) SYM, @@ -1463,7 +1465,7 @@ gomp_target *gimple_build_omp_target (gimple_seq, int, tree); gomp_teams *gimple_build_omp_teams (gimple_seq, tree); gomp_atomic_load *gimple_build_omp_atomic_load (tree, tree); gomp_atomic_store *gimple_build_omp_atomic_store (tree); -gtransaction *gimple_build_transaction (gimple_seq, tree); +gtransaction *gimple_build_transaction (gimple_seq); extern void gimple_seq_add_stmt (gimple_seq *, gimple *); extern void gimple_seq_add_stmt_without_update (gimple_seq *, gimple *); void gimple_seq_add_seq (gimple_seq *, gimple_seq); @@ -5847,21 +5849,45 @@ gimple_transaction_body_ptr (gtransaction *transaction_stmt) static inline gimple_seq gimple_transaction_body (gtransaction *transaction_stmt) { - return *gimple_transaction_body_ptr (transaction_stmt); + return transaction_stmt->body; } /* Return the label associated with a GIMPLE_TRANSACTION. */ static inline tree -gimple_transaction_label (const gtransaction *transaction_stmt) +gimple_transaction_label_norm (const gtransaction *transaction_stmt) { - return transaction_stmt->label; + return transaction_stmt->label_norm; } static inline tree * -gimple_transaction_label_ptr (gtransaction *transaction_stmt) +gimple_transaction_label_norm_ptr (gtransaction *transaction_stmt) { - return &transaction_stmt->label; + return &transaction_stmt->label_norm; +} + +static inline tree +gimple_transaction_label_uninst (const gtransaction *transaction_stmt) +{ + return transaction_stmt->label_uninst; +} + +static inline tree * +gimple_transaction_label_uninst_ptr (gtransaction *transaction_stmt) +{ + return &transaction_stmt->label_uninst; +} + +static inline tree +gimple_transaction_label_over (const gtransaction *transaction_stmt) +{ + return transaction_stmt->label_over; +} + +static inline tree * +gimple_transaction_label_over_ptr (gtransaction *transaction_stmt) +{ + return &transaction_stmt->label_over; } /* Return the subcode associated with a GIMPLE_TRANSACTION. */ @@ -5885,9 +5911,21 @@ gimple_transaction_set_body (gtransaction *transaction_stmt, /* Set the label associated with a GIMPLE_TRANSACTION. */ static inline void -gimple_transaction_set_label (gtransaction *transaction_stmt, tree label) +gimple_transaction_set_label_norm (gtransaction *transaction_stmt, tree label) +{ + transaction_stmt->label_norm = label; +} + +static inline void +gimple_transaction_set_label_uninst (gtransaction *transaction_stmt, tree label) +{ + transaction_stmt->label_uninst = label; +} + +static inline void +gimple_transaction_set_label_over (gtransaction *transaction_stmt, tree label) { - transaction_stmt->label = label; + transaction_stmt->label_over = label; } /* Set the subcode associated with a GIMPLE_TRANSACTION. */ @@ -5899,7 +5937,6 @@ gimple_transaction_set_subcode (gtransaction *transaction_stmt, transaction_stmt->subcode = subcode; } - /* Return a pointer to the return value for GIMPLE_RETURN GS. */ static inline tree * |