git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in (cgraphunit.o): Add $(CFGLOOP_H) dependency. 

2013-06-18  Richard Biener  <rguenther@suse.de>

	* Makefile.in (cgraphunit.o): Add $(CFGLOOP_H) dependency.
	* cgraphunit.c: Include cfgloop.h.
	(init_lowered_empty_function): Initialize the loop tree.
	(assemble_thunk): Insert new BBs into loops.

From-SVN: r200169
This commit is contained in:
Richard Biener 2013-06-18 14:14:00 +00:00 committed by Richard Biener
parent ac0511f233
commit 31ee20ba67
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2013-06-18 Richard Biener <rguenther@suse.de>
* Makefile.in (cgraphunit.o): Add $(CFGLOOP_H) dependency.
* cgraphunit.c: Include cfgloop.h.
(init_lowered_empty_function): Initialize the loop tree.
(assemble_thunk): Insert new BBs into loops.
2013-06-18 Richard Biener <rguenther@suse.de> 2013-06-18 Richard Biener <rguenther@suse.de>
* tree-streamer.h (streamer_tree_cache_create): Adjust prototype. * tree-streamer.h (streamer_tree_cache_create): Adjust prototype.

2
gcc/Makefile.in
View File

@ -2903,7 +2903,7 @@ cgraphunit.o : cgraphunit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_FLOW_H) $(TREE_PASS_H) debug.h $(DIAGNOSTIC_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) debug.h $(DIAGNOSTIC_H) \
$(FIBHEAP_H) output.h $(PARAMS_H) $(RTL_H) $(IPA_PROP_H) \ $(FIBHEAP_H) output.h $(PARAMS_H) $(RTL_H) $(IPA_PROP_H) \
gt-cgraphunit.h tree-iterator.h $(COVERAGE_H) $(TREE_DUMP_H) \ gt-cgraphunit.h tree-iterator.h $(COVERAGE_H) $(TREE_DUMP_H) \
$(GIMPLE_PRETTY_PRINT_H) $(IPA_INLINE_H) $(IPA_UTILS_H) \ $(GIMPLE_PRETTY_PRINT_H) $(IPA_INLINE_H) $(IPA_UTILS_H) $(CFGLOOP_H) \
$(LTO_STREAMER_H) output.h $(REGSET_H) $(EXCEPT_H) $(GCC_PLUGIN_H) plugin.h $(LTO_STREAMER_H) output.h $(REGSET_H) $(EXCEPT_H) $(GCC_PLUGIN_H) plugin.h
cgraphclones.o : cgraphclones.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ cgraphclones.o : cgraphclones.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) langhooks.h $(TREE_INLINE_H) toplev.h $(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(GGC_H) \ $(TREE_H) langhooks.h $(TREE_INLINE_H) toplev.h $(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(GGC_H) \

16
gcc/cgraphunit.c
View File

@ -192,6 +192,7 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-utils.h" #include "ipa-utils.h"
#include "lto-streamer.h" #include "lto-streamer.h"
#include "except.h" #include "except.h"
#include "cfgloop.h"
#include "regset.h" /* FIXME: For reg_obstack. */ #include "regset.h" /* FIXME: For reg_obstack. */
/* Queue of cgraph nodes scheduled to be added into cgraph. This is a /* Queue of cgraph nodes scheduled to be added into cgraph. This is a
@ -1196,18 +1197,24 @@ init_lowered_empty_function (tree decl, bool in_ssa)
init_tree_ssa (cfun); init_tree_ssa (cfun);
init_ssa_operands (cfun); init_ssa_operands (cfun);
cfun->gimple_df->in_ssa_p = true; cfun->gimple_df->in_ssa_p = true;
cfun->curr_properties |= PROP_ssa;
} }
DECL_INITIAL (decl) = make_node (BLOCK); DECL_INITIAL (decl) = make_node (BLOCK);
DECL_SAVED_TREE (decl) = error_mark_node; DECL_SAVED_TREE (decl) = error_mark_node;
cfun->curr_properties |= cfun->curr_properties |= (PROP_gimple_lcf | PROP_gimple_leh | PROP_gimple_any
(PROP_gimple_lcf | PROP_gimple_leh | PROP_cfg | PROP_ssa | PROP_gimple_any); | PROP_cfg | PROP_loops);
set_loops_for_fn (cfun, ggc_alloc_cleared_loops ());
init_loops_structure (cfun, loops_for_fn (cfun), 1);
loops_for_fn (cfun)->state |= LOOPS_MAY_HAVE_MULTIPLE_LATCHES;
/* Create BB for body of the function and connect it properly. */ /* Create BB for body of the function and connect it properly. */
bb = create_basic_block (NULL, (void *) 0, ENTRY_BLOCK_PTR); bb = create_basic_block (NULL, (void *) 0, ENTRY_BLOCK_PTR);
make_edge (ENTRY_BLOCK_PTR, bb, 0); make_edge (ENTRY_BLOCK_PTR, bb, EDGE_FALLTHRU);
make_edge (bb, EXIT_BLOCK_PTR, 0); make_edge (bb, EXIT_BLOCK_PTR, 0);
add_bb_to_loop (bb, ENTRY_BLOCK_PTR->loop_father);
return bb; return bb;
} }
@ -1452,6 +1459,9 @@ assemble_thunk (struct cgraph_node *node)
then_bb = create_basic_block (NULL, (void *) 0, bb); then_bb = create_basic_block (NULL, (void *) 0, bb);
return_bb = create_basic_block (NULL, (void *) 0, then_bb); return_bb = create_basic_block (NULL, (void *) 0, then_bb);
else_bb = create_basic_block (NULL, (void *) 0, else_bb); else_bb = create_basic_block (NULL, (void *) 0, else_bb);
add_bb_to_loop (then_bb, bb->loop_father);
add_bb_to_loop (return_bb, bb->loop_father);
add_bb_to_loop (else_bb, bb->loop_father);
remove_edge (single_succ_edge (bb)); remove_edge (single_succ_edge (bb));
true_label = gimple_block_label (then_bb); true_label = gimple_block_label (then_bb);
stmt = gimple_build_cond (NE_EXPR, restmp, stmt = gimple_build_cond (NE_EXPR, restmp,