+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
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
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;
}
/* 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.
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);