diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2022-01-14 20:51:12 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@ispras.ru> | 2022-07-19 17:16:17 +0300 |
| commit | 26cea5f108e0facdb080e385000bb141b086845f (patch) | |
| tree | ff8fb6fd44e6609fcf03e6b331165cd38107246c | |
| parent | 76c3f0dc2f815e0e450642efd5348c3ab852e4d0 (diff) | |
| download | gcc-26cea5f108e0facdb080e385000bb141b086845f.zip gcc-26cea5f108e0facdb080e385000bb141b086845f.tar.gz gcc-26cea5f108e0facdb080e385000bb141b086845f.tar.bz2 | |
tree-cfg: do not duplicate returns_twice calls
A returns_twice call may have associated abnormal edges that correspond
to the "second return" from the call. If the call is duplicated, the
copies of those edges also need to be abnormal, but e.g. tracer does not
enforce that. Just prohibit the (unlikely to be useful) duplication.
gcc/ChangeLog:
* cfghooks.cc (duplicate_block): Expand comment.
* tree-cfg.cc (gimple_can_duplicate_bb_p): Reject blocks with
calls that may return twice.
| -rw-r--r-- | gcc/cfghooks.cc | 13 | ||||
| -rw-r--r-- | gcc/tree-cfg.cc | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/gcc/cfghooks.cc b/gcc/cfghooks.cc index e435891..c6ac953 100644 --- a/gcc/cfghooks.cc +++ b/gcc/cfghooks.cc @@ -1086,9 +1086,16 @@ can_duplicate_block_p (const_basic_block bb) return cfg_hooks->can_duplicate_block_p (bb); } -/* Duplicates basic block BB and redirects edge E to it. Returns the - new basic block. The new basic block is placed after the basic block - AFTER. */ +/* Duplicate basic block BB, place it after AFTER (if non-null) and redirect + edge E to it (if non-null). Return the new basic block. + + If BB contains a returns_twice call, the caller is responsible for recreating + incoming abnormal edges corresponding to the "second return" for the copy. + gimple_can_duplicate_bb_p rejects such blocks, while RTL likes to live + dangerously. + + If BB has incoming abnormal edges for some other reason, their destinations + should be tied to label(s) of the original BB and not the copy. */ basic_block duplicate_block (basic_block bb, edge e, basic_block after, copy_bb_data *id) diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc index bfcb142..a365aad 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -6313,12 +6313,15 @@ gimple_can_duplicate_bb_p (const_basic_block bb) { gimple *g = gsi_stmt (gsi); - /* An IFN_GOMP_SIMT_ENTER_ALLOC/IFN_GOMP_SIMT_EXIT call must be + /* Prohibit duplication of returns_twice calls, otherwise associated + abnormal edges also need to be duplicated properly. + An IFN_GOMP_SIMT_ENTER_ALLOC/IFN_GOMP_SIMT_EXIT call must be duplicated as part of its group, or not at all. The IFN_GOMP_SIMT_VOTE_ANY and IFN_GOMP_SIMT_XCHG_* are part of such a group, so the same holds there. */ if (is_gimple_call (g) - && (gimple_call_internal_p (g, IFN_GOMP_SIMT_ENTER_ALLOC) + && (gimple_call_flags (g) & ECF_RETURNS_TWICE + || gimple_call_internal_p (g, IFN_GOMP_SIMT_ENTER_ALLOC) || gimple_call_internal_p (g, IFN_GOMP_SIMT_EXIT) || gimple_call_internal_p (g, IFN_GOMP_SIMT_VOTE_ANY) || gimple_call_internal_p (g, IFN_GOMP_SIMT_XCHG_BFLY) |