/*
* the first block has the initial exec as cfg predecessor
*/
- if (node != current_ir_graph->start_block) {
+ if (node != get_irg_start_block(current_ir_graph)) {
for (i = 0; i < n_pred; ++i) {
if (get_Block_cfgpred(node, i) == data->proj_X) {
data->block = node;
ir_node *p;
int i, j, n_params;
collect_t data;
- int rem = get_optimize();
- entity *ent = get_irg_entity(irg);
- type *method_tp = get_entity_type(ent);
+ int rem = get_optimize();
+ entity *ent = get_irg_entity(irg);
+ ir_type *method_tp = get_entity_type(ent);
assert(n_tail_calls);
- /* we add new nodes, so the outs are inconsistant */
+ /* we add new nodes, so the outs are inconsistent */
set_irg_outs_inconsistent(irg);
/* we add new blocks and change the control flow */
- set_irg_dom_inconsistent(irg);
+ set_irg_doms_inconsistent(irg);
+ set_irg_extblk_inconsistent(irg);
/* we add a new loop */
set_irg_loopinfo_inconsistent(irg);
phis[0] = new_r_Phi(irg, block, n_tail_calls + 1, in, mode_M);
- /* build the data phi's */
+ /* build the data Phi's */
if (n_params > 0) {
ir_node *calls;
+ ir_node *args;
NEW_ARR_A(ir_node **, call_params, n_tail_calls);
++i;
}
- /* build new projs and Phi's */
+ /* build new Proj's and Phi's */
+ args = get_irg_args(irg);
for (i = 0; i < n_params; ++i) {
ir_mode *mode = get_type_mode(get_method_param_type(method_tp, i));
- in[0] = new_r_Proj(irg, block, irg->args, mode, i);
+ in[0] = new_r_Proj(irg, block, args, mode, i);
for (j = 0; j < n_tail_calls; ++j)
in[j + 1] = call_params[j][i];
}
/* tail recursion was done, all info is invalid */
- set_irg_dom_inconsistent(irg);
+ set_irg_doms_inconsistent(irg);
set_irg_outs_inconsistent(irg);
+ set_irg_extblk_inconsistent(irg);
set_irg_loopinfo_state(current_ir_graph, loopinfo_cf_inconsistent);
set_trouts_inconsistent();
set_irg_callee_info_state(irg, irg_callee_info_inconsistent);
for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(irg_frame, i);
- if (get_irn_op(succ) == op_Sel && is_address_taken(succ))
+ if (is_Sel(succ) && is_address_taken(succ))
return 0;
}
return 1;
ir_node *end_block;
int i, n_tail_calls = 0;
ir_node *rets = NULL;
- type *mtd_type, *call_type;
+ ir_type *mtd_type, *call_type;
if (! get_opt_tail_recursion() || ! get_opt_optimize())
return 0;
int j;
ir_node **ress;
- /* search all returns of a block */
- if (get_irn_op(ret) != op_Return)
+ /* search all Returns of a block */
+ if (! is_Return(ret))
continue;
/* check, if it's a Return self() */
call = skip_Proj(get_Return_mem(ret));
- if (get_irn_op(call) != op_Call)
+ if (! is_Call(call))
continue;
/* check if it's a recursive call */