===================================================================
@@ -30,11 +30,10 @@ along with GCC; see the file COPYING3.
#include "tm.h"
#include "tree.h"
#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"
#include "langhooks-def.h"
#include "flags.h"
===================================================================
@@ -1885,15 +1885,12 @@ struct GTY(()) tree_exp {
/* Attributes for SSA_NAMEs for pointer-type variables. */
#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. */
typedef struct GTY(()) ssa_use_operand_d {
struct ssa_use_operand_d* GTY((skip(""))) prev;
@@ -5568,6 +5565,9 @@ static inline bool
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 */
===================================================================
@@ -49,11 +49,10 @@ along with GCC; see the file COPYING3.
#include "c-family/c-pragma.h"
#include "diagnostic.h"
#include "intl.h"
#include "debug.h"
#include "timevar.h"
-#include "tree-flow.h"
#include "pointer-set.h"
#include "splay-tree.h"
#include "plugin.h"
/* Possible cases of bad specifiers type used by bad_specifiers. */
===================================================================
@@ -29,13 +29,13 @@ along with GCC; see the file COPYING3.
#include "flags.h"
#include "toplev.h"
#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 *);
static int list_hash_eq (const void *, const void *);
static hashval_t list_hash_pieces (tree, tree, tree);
===================================================================
@@ -31,11 +31,10 @@
#include "flags.h"
#include "ggc.h"
#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"
#include "adadecode.h"
#include "types.h"
===================================================================
@@ -37,11 +37,12 @@ along with GCC; see the file COPYING3.
#include "output.h"
#include "toplev.h"
#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. */
enum impl_conv {
ic_argpass,
===================================================================
@@ -538,11 +538,10 @@ extern void phinodes_print_statistics (v
#endif
/* 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);