From 6662d794044f9124db635ba8acaa82c9483a3b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez-Ib=C3=A1=C3=B1ez?= Date: Wed, 30 Jun 2010 07:39:21 +0000 Subject: [PATCH] tree.h (block_may_fallthru): Declare here. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2010-06-30 Manuel López-Ibáñez * tree.h (block_may_fallthru): Declare here. * tree-flow.h (block_may_fallthru): Do not declare here. * c-typeck.c: Do not include tree-flow.h. Include gimple.h and bitmap.h * Makefile.in (c-typeck.o): Update dependencies. c-family/ * c-gimplify.c: Do not include tree-flow.h cp/ * tree.c: Include gimple.h. Do not include tree-flow.h * decl.c: Do not include tree-flow.h * Make-lang.in: Adjust dependencies. ada/ * gcc-interface/trans.c: Do not include tree-flow.h. * gcc-interface/Make-lang.in: Adjust dependencies. From-SVN: r161591 --- gcc/ChangeLog | 8 ++++++++ gcc/Makefile.in | 4 ++-- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/Make-lang.in | 2 +- gcc/ada/gcc-interface/trans.c | 1 - gcc/c-family/ChangeLog | 4 ++++ gcc/c-family/c-gimplify.c | 1 - gcc/c-typeck.c | 3 ++- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/Make-lang.in | 4 ++-- gcc/cp/decl.c | 1 - gcc/cp/tree.c | 2 +- gcc/tree-flow.h | 1 - gcc/tree.h | 8 ++++---- 14 files changed, 35 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 40f79171d6c..bb8f81e5223 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-06-30 Manuel López-Ibáñez + + * tree.h (block_may_fallthru): Declare here. + * tree-flow.h (block_may_fallthru): Do not declare here. + * c-typeck.c: Do not include tree-flow.h. Include gimple.h and + bitmap.h + * Makefile.in (c-typeck.o): Update dependencies. + 2010-06-30 Jakub Jelinek PR debug/44694 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index f3abfd46fa1..deed1aeffda 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2027,7 +2027,7 @@ c-parser.o : c-parser.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ c-typeck.o : c-typeck.c c-lang.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(C_TREE_H) $(TARGET_H) $(FLAGS_H) intl.h output.h $(EXPR_H) \ - $(TOPLEV_H) langhooks.h $(TREE_FLOW_H) tree-iterator.h + $(TOPLEV_H) langhooks.h tree-iterator.h $(BITMAP_H) $(GIMPLE_H) @@ -2096,7 +2096,7 @@ c-family/c-format.o : c-family/c-format.c c-family/c-format.h \ c-family/c-gimplify.o : c-family/c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \ $(C_COMMON_H) $(DIAGNOSTIC_CORE_H) $(GIMPLE_H) \ - $(FLAGS_H) langhooks.h $(TOPLEV_H) $(TREE_FLOW_H) $(LANGHOOKS_DEF_H) \ + $(FLAGS_H) langhooks.h $(TOPLEV_H) $(LANGHOOKS_DEF_H) \ $(TM_H) coretypes.h $(C_PRETTY_PRINT_H) $(CGRAPH_H) $(BASIC_BLOCK_H) \ hard-reg-set.h $(TREE_DUMP_H) $(TREE_INLINE_H) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 03ea684e8c8..98680a8ab03 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2010-06-30 Manuel López-Ibáñez + + * gcc-interface/trans.c: Do not include tree-flow.h. + * gcc-interface/Make-lang.in: Adjust dependencies. + 2010-06-29 Nathan Froyd * gcc-interface/gigi.h (gnat_build_constructor): Take a VEC instead diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 095ae08bbad..8db581098dc 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -1260,7 +1260,7 @@ ada/targtyps.o : ada/gcc-interface/targtyps.c $(CONFIG_H) $(SYSTEM_H) \ $(COMPILER) -c $(ALL_COMPILERFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/trans.o : ada/gcc-interface/trans.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(TREE_H) $(FLAGS_H) output.h tree-iterator.h $(TREE_FLOW_H) \ + $(TM_H) $(TREE_H) $(FLAGS_H) output.h tree-iterator.h \ $(GIMPLE_H) ada/gcc-interface/ada.h ada/adadecode.h ada/types.h \ ada/atree.h ada/elists.h ada/namet.h ada/nlists.h ada/snames.h \ ada/stringt.h ada/uintp.h ada/urealp.h ada/fe.h ada/sinfo.h ada/einfo.h \ diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index c62e7e632c8..46848f230f7 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -33,7 +33,6 @@ #include "output.h" #include "libfuncs.h" /* For set_stack_check_libfunc. */ #include "tree-iterator.h" -#include "tree-flow.h" #include "gimple.h" #include "ada.h" diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 96caffcc689..4047ca54176 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2010-06-30 Manuel López-Ibáñez + + * c-gimplify.c: Do not include tree-flow.h + 2010-06-29 Joern Rennecke PR other/44034 diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c index 06963a05e71..f446ebbb214 100644 --- a/gcc/c-family/c-gimplify.c +++ b/gcc/c-family/c-gimplify.c @@ -32,7 +32,6 @@ along with GCC; see the file COPYING3. If not see #include "c-common.h" #include "gimple.h" #include "basic-block.h" -#include "tree-flow.h" #include "tree-inline.h" #include "diagnostic-core.h" #include "langhooks.h" diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index f8bfb519711..18e4bdcebfe 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -39,7 +39,8 @@ along with GCC; see the file COPYING3. If not see #include "intl.h" #include "target.h" #include "tree-iterator.h" -#include "tree-flow.h" +#include "bitmap.h" +#include "gimple.h" /* Possible cases of implicit bad conversions. Used to select diagnostic messages in convert_for_assignment. */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 44c843b4b74..72463e871d5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2010-06-30 Manuel López-Ibáñez + + * tree.c: Include gimple.h. Do not include tree-flow.h + * decl.c: Do not include tree-flow.h + * Make-lang.in: Adjust dependencies. + 2010-06-29 Nathan Froyd * decl.c (incomplete_var): Declare. Declare VECs containing them. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index f664c78f12f..7a605b743aa 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -253,7 +253,7 @@ cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) $(TM_H) toplev.h debug.h langhooks.h \ cp/decl.o: cp/decl.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h \ output.h toplev.h $(HASHTAB_H) $(RTL_H) \ cp/operators.def $(TM_P_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(C_PRAGMA_H) \ - debug.h gt-cp-decl.h $(TIMEVAR_H) $(TREE_FLOW_H) $(TARGET_H) $(PLUGIN_H) \ + debug.h gt-cp-decl.h $(TIMEVAR_H) $(TARGET_H) $(PLUGIN_H) \ intl.h tree-iterator.h $(SPLAY_TREE_H) cp/decl2.o: cp/decl2.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) cp/decl.h \ output.h toplev.h $(C_COMMON_H) gt-cp-decl2.h $(CGRAPH_H) \ @@ -284,7 +284,7 @@ cp/search.o: cp/search.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ intl.h cp/tree.o: cp/tree.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h \ $(TREE_INLINE_H) $(REAL_H) gt-cp-tree.h \ - $(TARGET_H) debug.h $(TREE_FLOW_H) $(CGRAPH_H) $(SPLAY_TREE_H) + $(TARGET_H) debug.h $(CGRAPH_H) $(SPLAY_TREE_H) $(GIMPLE_H) cp/ptree.o: cp/ptree.c $(CXX_TREE_H) $(TM_H) cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) toplev.h convert.h \ $(TARGET_H) $(C_PRAGMA_H) gt-cp-rtti.h intl.h diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index cf92e4d061e..1d11fb8f785 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -50,7 +50,6 @@ along with GCC; see the file COPYING3. If not see #include "intl.h" #include "debug.h" #include "timevar.h" -#include "tree-flow.h" #include "pointer-set.h" #include "splay-tree.h" #include "plugin.h" diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 6d1ff10ea17..d62f9d7acf6 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -31,9 +31,9 @@ along with GCC; see the file COPYING3. If not see #include "tree-inline.h" #include "debug.h" #include "convert.h" -#include "tree-flow.h" #include "cgraph.h" #include "splay-tree.h" +#include "gimple.h" /* gimple_has_body_p */ static tree bot_manip (tree *, int *, void *); static tree bot_replace (tree *, int *, void *); diff --git a/gcc/tree-flow.h b/gcc/tree-flow.h index ffec3bc9b22..af396411974 100644 --- a/gcc/tree-flow.h +++ b/gcc/tree-flow.h @@ -512,7 +512,6 @@ extern void phinodes_print_statistics (void); /* In gimple-low.c */ extern void record_vars_into (tree, tree); extern void record_vars (tree); -extern bool block_may_fallthru (const_tree); extern bool gimple_seq_may_fallthru (gimple_seq); extern bool gimple_stmt_may_fallthru (gimple); extern bool gimple_check_call_args (gimple); diff --git a/gcc/tree.h b/gcc/tree.h index b3ba5493fd4..5253bf9a50a 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -1887,11 +1887,8 @@ struct GTY(()) tree_exp { #define SSA_NAME_PTR_INFO(N) \ SSA_NAME_CHECK (N)->ssa_name.ptr_info -#ifndef _TREE_FLOW_H +/* Defined in tree-flow.h. */ struct ptr_info_def; -#endif - - /* Immediate use linking structure. This structure is used for maintaining a doubly linked list of uses of an SSA_NAME. */ @@ -5571,4 +5568,7 @@ is_lang_specific (tree t) return TREE_CODE (t) == LANG_TYPE || TREE_CODE (t) >= NUM_TREE_CODES; } +/* In gimple-low.c. */ +extern bool block_may_fallthru (const_tree); + #endif /* GCC_TREE_H */