diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/basic-block.h | 3 | ||||
| -rw-r--r-- | gcc/cfg.c | 6 | ||||
| -rw-r--r-- | gcc/cfgbuild.c | 3 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 13 |
5 files changed, 28 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 10efafa9730..14a02eade25 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-06-07 Richard Henderson <rth@redhat.com> + + * basic-block.h (EDGE_SIBCALL): New. + (EDGE_ALL_FLAGS): Update. + * cfg.c (dump_edge_info): Add sibcall name. + * cfgbuild.c (make_edges): Use EDGE_SIBCALL. + * cfgrtl.c (purge_dead_edges): Handle sibcalls. + 2003-06-07 Andreas Jaeger <aj@suse.de> * mklibgcc.in (lib2funcs): Remove _exit. diff --git a/gcc/basic-block.h b/gcc/basic-block.h index a229367c9ec..4aa47dd50ba 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -151,7 +151,8 @@ typedef struct edge_def { #define EDGE_CAN_FALLTHRU 64 /* Candidate for straight line flow. */ #define EDGE_IRREDUCIBLE_LOOP 128 /* Part of irreducible loop. */ -#define EDGE_ALL_FLAGS 255 +#define EDGE_SIBCALL 256 /* Edge from sibcall to exit. */ +#define EDGE_ALL_FLAGS 511 #define EDGE_COMPLEX (EDGE_ABNORMAL | EDGE_ABNORMAL_CALL | EDGE_EH) diff --git a/gcc/cfg.c b/gcc/cfg.c index 7e4aa4035dc..93736a66bb2 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -652,8 +652,10 @@ dump_edge_info (file, e, do_succ) if (e->flags) { - static const char * const bitnames[] - = {"fallthru", "ab", "abcall", "eh", "fake", "dfs_back", "can_fallthru","irreducible"}; + static const char * const bitnames[] = { + "fallthru", "ab", "abcall", "eh", "fake", "dfs_back", + "can_fallthru", "irreducible", "sibcall" + }; int comma = 0; int i, flags = e->flags; diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c index 69fcc15294b..ed8dfb88066 100644 --- a/gcc/cfgbuild.c +++ b/gcc/cfgbuild.c @@ -406,8 +406,7 @@ make_edges (label_value_list, min, max, update_p) worry about EH edges, since we wouldn't have created the sibling call in the first place. */ if (code == CALL_INSN && SIBLING_CALL_P (insn)) - cached_make_edge (edge_cache, bb, EXIT_BLOCK_PTR, - EDGE_ABNORMAL | EDGE_ABNORMAL_CALL); + cached_make_edge (edge_cache, bb, EXIT_BLOCK_PTR, EDGE_SIBCALL); /* If this is a CALL_INSN, then mark it as reaching the active EH handler for this CALL_INSN. If we're handling non-call diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index b0678f09f1c..21208c9763a 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -2299,6 +2299,19 @@ purge_dead_edges (bb) return purged; } + else if (GET_CODE (insn) == CALL_INSN && SIBLING_CALL_P (insn)) + { + /* First, there should not be any EH or ABCALL edges resulting + from non-local gotos and the like. If there were, we shouldn't + have created the sibcall in the first place. Second, there + should of course never have been a fallthru edge. */ + if (!bb->succ || bb->succ->succ_next) + abort (); + if (bb->succ->flags != EDGE_SIBCALL) + abort (); + + return 0; + } /* If we don't see a jump insn, we don't know exactly why the block would have been broken at this point. Look for a simple, non-fallthru edge, |
