diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 2007-09-18 03:25:06 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 2007-09-18 03:25:06 +0000 |
| commit | 0e01499666a5032861459cd9fd07bdb8df149637 (patch) | |
| tree | ec582d552dcb92bb22aaf8ec7640fc36fa032539 /gcc | |
| parent | e49e06d8d0dc95ae92d4601c4731d218459e5dfd (diff) | |
| download | gcc-0e01499666a5032861459cd9fd07bdb8df149637.zip gcc-0e01499666a5032861459cd9fd07bdb8df149637.tar.gz gcc-0e01499666a5032861459cd9fd07bdb8df149637.tar.bz2 | |
tree-cfg.c (is_ctrl_altering_stmt, [...]): Don't use const_get_call_expr_in.
* tree-cfg.c (is_ctrl_altering_stmt, tree_block_ends_with_call_p):
Don't use const_get_call_expr_in.
* tree-gimple.c (const_get_call_expr_in): Delete.
* tree-gimple.h (const_get_call_expr_in): Likewise.
From-SVN: r128569
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 4 | ||||
| -rw-r--r-- | gcc/tree-gimple.c | 28 | ||||
| -rw-r--r-- | gcc/tree-gimple.h | 1 |
4 files changed, 18 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 64bdbe7..d9f37e8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-09-17 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * tree-cfg.c (is_ctrl_altering_stmt, tree_block_ends_with_call_p): + Don't use const_get_call_expr_in. + * tree-gimple.c (const_get_call_expr_in): Delete. + * tree-gimple.h (const_get_call_expr_in): Likewise. + 2007-09-18 Richard Sandiford <rsandifo@nildram.co.uk> * df-scan.c (df_notes_rescan): Do nothing if the instruction does diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 3de20cc..fd981f3 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2459,7 +2459,7 @@ is_ctrl_altering_stmt (const_tree t) const_tree call; gcc_assert (t); - call = const_get_call_expr_in (t); + call = get_call_expr_in (CONST_CAST_TREE (t)); if (call) { /* A non-pure/const CALL_EXPR alters flow control if the current @@ -6244,7 +6244,7 @@ static bool tree_block_ends_with_call_p (basic_block bb) { block_stmt_iterator bsi = bsi_last (bb); - return const_get_call_expr_in (bsi_stmt (bsi)) != NULL; + return get_call_expr_in (bsi_stmt (bsi)) != NULL; } diff --git a/gcc/tree-gimple.c b/gcc/tree-gimple.c index 42a29ad..8e976e2 100644 --- a/gcc/tree-gimple.c +++ b/gcc/tree-gimple.c @@ -436,28 +436,18 @@ is_gimple_call_addr (tree t) /* If T makes a function call, return the corresponding CALL_EXPR operand. Otherwise, return NULL_TREE. */ -#define GET_CALL_EXPR_IN_BODY do { \ - /* FIXME tuples: delete the assertion below when conversion complete. */ \ - gcc_assert (TREE_CODE (t) != MODIFY_EXPR); \ - if (TREE_CODE (t) == GIMPLE_MODIFY_STMT) \ - t = GIMPLE_STMT_OPERAND (t, 1); \ - if (TREE_CODE (t) == WITH_SIZE_EXPR) \ - t = TREE_OPERAND (t, 0); \ - if (TREE_CODE (t) == CALL_EXPR) \ - return t; \ - return NULL_TREE; \ -} while (0) - tree get_call_expr_in (tree t) { - GET_CALL_EXPR_IN_BODY; -} - -const_tree -const_get_call_expr_in (const_tree t) -{ - GET_CALL_EXPR_IN_BODY; + /* FIXME tuples: delete the assertion below when conversion complete. */ + gcc_assert (TREE_CODE (t) != MODIFY_EXPR); + if (TREE_CODE (t) == GIMPLE_MODIFY_STMT) + t = GIMPLE_STMT_OPERAND (t, 1); + if (TREE_CODE (t) == WITH_SIZE_EXPR) + t = TREE_OPERAND (t, 0); + if (TREE_CODE (t) == CALL_EXPR) + return t; + return NULL_TREE; } /* Given a memory reference expression T, return its base address. diff --git a/gcc/tree-gimple.h b/gcc/tree-gimple.h index 3a121c07..09182d7 100644 --- a/gcc/tree-gimple.h +++ b/gcc/tree-gimple.h @@ -90,7 +90,6 @@ extern bool is_gimple_non_addressable (tree t); extern bool is_gimple_call_addr (tree); /* If T makes a function call, returns the CALL_EXPR operand. */ extern tree get_call_expr_in (tree t); -extern const_tree const_get_call_expr_in (const_tree t); extern void recalculate_side_effects (tree); |