CbC/CbC_gcc: gcc/tree-ssa-phiopt.c comparison

comparison gcc/tree-ssa-phiopt.c @ 55:77e2b8dfacca gcc-4.4.5

update it from 4.4.3 to 4.5.0

author	ryoma <e075725@ie.u-ryukyu.ac.jp>
date	Fri, 12 Feb 2010 23:39:51 +0900
parents	a06113de4d67
children	b7f97abdc517

comparison

equal deleted inserted replaced

-:c156f1bd5cd9
+:77e2b8dfacca
 outer ones, and also that we do not try to visit a removed
 block.  */
 bb_order = blocks_in_phiopt_order ();
 n = n_basic_blocks - NUM_FIXED_BLOCKS;
 for (i = 0; i < n; i++)
 {
 gimple cond_stmt, phi;
 basic_block bb1, bb2;
 edge e1, e2;
 tree arg0, arg1;
 	    cfgchanged = true;
 	}
 }
 free (bb_order);
 if (do_store_elim)
 pointer_set_destroy (nontrap);
 /* If the CFG has changed, we should cleanup the CFG.  */
 if (cfgchanged && do_store_elim)
 {
 basic_block *
 blocks_in_phiopt_order (void)
 {
 basic_block x, y;
 basic_block *order = XNEWVEC (basic_block, n_basic_blocks);
 unsigned n = n_basic_blocks - NUM_FIXED_BLOCKS;
 unsigned np, i;
 sbitmap visited = sbitmap_alloc (last_basic_block);
 #define MARK_VISITED(BB) (SET_BIT (visited, (BB)->index))
 #define VISITED_P(BB) (TEST_BIT (visited, (BB)->index))
 sbitmap_zero (visited);
 MARK_VISITED (ENTRY_BLOCK_PTR);
 FOR_EACH_BB (x)
 bool
 empty_block_p (basic_block bb)
 {
 /* BB must have no executable statements.  */
-return gsi_end_p (gsi_after_labels (bb));
+gimple_stmt_iterator gsi = gsi_after_labels (bb);
+if (gsi_end_p (gsi))
+return true;
+if (is_gimple_debug (gsi_stmt (gsi)))
+gsi_next_nondebug (&gsi);
+return gsi_end_p (gsi);
 }
 /* Replace PHI node element whose edge is E in block BB with variable NEW.
 Remove the edge from COND_BLOCK which does not lead to BB (COND_BLOCK
 is known to have two edges, one of which must reach BB).  */
 new_var = force_gimple_operand_gsi (&gsi, cond, true, NULL, true,
 				      GSI_SAME_STMT);
 if (!useless_type_conversion_p (TREE_TYPE (result), TREE_TYPE (new_var)))
 {
+source_location locus_0, locus_1;
 new_var2 = create_tmp_var (TREE_TYPE (result), NULL);
 add_referenced_var (new_var2);
 new_stmt = gimple_build_assign_with_ops (CONVERT_EXPR, new_var2,
 					       new_var, NULL);
 new_var2 = make_ssa_name (new_var2, new_stmt);
 gimple_assign_set_lhs (new_stmt, new_var2);
 gsi_insert_before (&gsi, new_stmt, GSI_SAME_STMT);
 new_var = new_var2;
+/* Set the locus to the first argument, unless is doesn't have one.  */
+locus_0 = gimple_phi_arg_location (phi, 0);
+locus_1 = gimple_phi_arg_location (phi, 1);
+if (locus_0 == UNKNOWN_LOCATION)
+locus_0 = locus_1;
+gimple_set_location (new_stmt, locus_0);
 }
 replace_phi_edge_with_variable (cond_bb, e1, phi, new_var);
 /* Note that we optimized this PHI.  */
 {
 if (operand_equal_for_phi_arg_p (arg_true, smaller)
 	  && operand_equal_for_phi_arg_p (arg_false, larger))
 	{
 	  /* Case
 	     if (smaller < larger)
 	     rslt = smaller;
 	     else
 	     rslt = larger;  */
 	  minmax = MIN_EXPR;
 	    return false;
 	}
 /* Move the statement from the middle block.  */
 gsi = gsi_last_bb (cond_bb);
-gsi_from = gsi_last_bb (middle_bb);
+gsi_from = gsi_last_nondebug_bb (middle_bb);
 gsi_move_before (&gsi_from, &gsi);
 }
 /* Emit the statement to compute min/max.  */
 result = duplicate_ssa_name (PHI_RESULT (phi), NULL);
 assign = last_and_only_stmt (middle_bb);
 /* If we did not find the proper negation assignment, then we can not
 optimize.  */
 if (assign == NULL)
 return false;
 /* If we got here, then we have found the only executable statement
 in OTHER_BLOCK.  If it is anything other than arg = -arg1 or
 arg1 = -arg0, then we can not optimize.  */
 if (gimple_code (assign) != GIMPLE_ASSIGN)
 return false;
 if (gimple_assign_rhs_code (assign) != NEGATE_EXPR)
 return false;
 rhs = gimple_assign_rhs1 (assign);
 /* The assignment has to be arg0 = -arg1 or arg1 = -arg0.  */
 if (!(lhs == arg0 && rhs == arg1)
 && !(lhs == arg1 && rhs == arg0))
 return false;
 dominance information.  */
 calculate_dominance_info (CDI_DOMINATORS);
 /* Setup callbacks for the generic dominator tree walker.  */
 nontrap_set = nontrap;
-walk_data.walk_stmts_backward = false;
 walk_data.dom_direction = CDI_DOMINATORS;
 walk_data.initialize_block_local_data = NULL;
-walk_data.before_dom_children_before_stmts = nt_init_block;
+walk_data.before_dom_children = nt_init_block;
-walk_data.before_dom_children_walk_stmts = NULL;
+walk_data.after_dom_children = nt_fini_block;
-walk_data.before_dom_children_after_stmts = NULL;
-walk_data.after_dom_children_before_stmts = NULL;
-walk_data.after_dom_children_walk_stmts = NULL;
-walk_data.after_dom_children_after_stmts = nt_fini_block;
 walk_data.global_data = NULL;
 walk_data.block_local_data_size = 0;
-walk_data.interesting_blocks = NULL;
 init_walk_dominator_tree (&walk_data);
 walk_dominator_tree (&walk_data, ENTRY_BLOCK_PTR);
 fini_walk_dominator_tree (&walk_data);
 htab_delete (seen_ssa_names);
 {
 gimple assign = last_and_only_stmt (middle_bb);
 tree lhs, rhs, name;
 gimple newphi, new_stmt;
 gimple_stmt_iterator gsi;
+source_location locus;
 enum tree_code code;
 /* Check if middle_bb contains of only one store.  */
 if (!assign
 || gimple_code (assign) != GIMPLE_ASSIGN)
 return false;
+locus = gimple_location (assign);
 lhs = gimple_assign_lhs (assign);
 rhs = gimple_assign_rhs1 (assign);
 if (!INDIRECT_REF_P (lhs))
 return false;
 on the edge which did not contain the store.  */
 lhs = unshare_expr (lhs);
 new_stmt = gimple_build_assign (condstoretemp, lhs);
 name = make_ssa_name (condstoretemp, new_stmt);
 gimple_assign_set_lhs (new_stmt, name);
+gimple_set_location (new_stmt, locus);
 mark_symbols_for_renaming (new_stmt);
 gsi_insert_on_edge (e1, new_stmt);
 /* 4) Create a PHI node at the join block, with one argument
 holding the old RHS, and the other holding the temporary
 where we stored the old memory contents.  */
 newphi = create_phi_node (condstoretemp, join_bb);
-add_phi_arg (newphi, rhs, e0);
+add_phi_arg (newphi, rhs, e0, locus);
-add_phi_arg (newphi, name, e1);
+add_phi_arg (newphi, name, e1, locus);
 lhs = unshare_expr (lhs);
 new_stmt = gimple_build_assign (lhs, PHI_RESULT (newphi));
 mark_symbols_for_renaming (new_stmt);
 tree_ssa_phiopt,			/* execute */
 NULL,					/* sub */
 NULL,					/* next */
 0,					/* static_pass_number */
 TV_TREE_PHIOPT,			/* tv_id */
-PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+PROP_cfg | PROP_ssa,			/* properties_required */
 0,					/* properties_provided */
 0,					/* properties_destroyed */
 0,					/* todo_flags_start */
 TODO_dump_func
 | TODO_ggc_collect
 tree_ssa_cs_elim,			/* execute */
 NULL,					/* sub */
 NULL,					/* next */
 0,					/* static_pass_number */
 TV_TREE_PHIOPT,			/* tv_id */
-PROP_cfg | PROP_ssa | PROP_alias,	/* properties_required */
+PROP_cfg | PROP_ssa,			/* properties_required */
 0,					/* properties_provided */
 0,					/* properties_destroyed */
 0,					/* todo_flags_start */
 TODO_dump_func
 | TODO_ggc_collect

Mercurial > hg > CbC > CbC_gcc

comparison gcc/tree-ssa-phiopt.c @ 55:77e2b8dfacca gcc-4.4.5