This one covers the front end files which included gimple.h
Bootstraps on x86_64-unknown-linux-gnu with no new regressions. OK?
Andrew
* ada/gcc-interface/trans.c: Include gimplify.h.
* c/c-typeck.c: Include gimplify.h.
* c-family/c-common.c: Include gimplify.h.
* c-family/c-gimplify.c: Likewise.
* c-family/cilk.c: Likewise.
* c-family/c-omp.c: Include gimple-expr.h instead of gimple.h.
* c-family/c-ubsan.c: Don't include gimple.h.
* cp/class.c: Include gimplify.h.
* cp/cp-gimplify.c: Likewise.
* cp/error.c: Likewise.
* cp/init.c: Likewise.
* cp/optimize.c: Likewise.
* cp/pt.c: Likewise.
* cp/semantics.c: Likewise.
* cp/tree.c: Likewise.
* cp/vtable-class-hierarchy.c: Likewise.
* cp/decl2.c: Don't include gimple.h.
* cp/except.c: Likewise.
* cp/method.c: Include pointer-set.h instead of gimple.h.
* fortran/f95-lang.c: Don't include gimple.h.
* fortran/trans-array.c: Include gimple-expr.h instead of gimple.h.
* fortran/trans.c: Likewise.
* fortran/trans-decl.c: Likewise.
* fortran/trans-expr.c: Include gimplify.h.
* fortran/trans-openmp.c: Likewise.
* go/go-lang.c: Include gimplify.h.
* go/gofrontend/expressions.cc: Likewise.
* go/gofrontend/gogo-tree.cc: Likewise.
* go/gofrontend/types.cc: Likewise.
* java/java-gimplify.c: Include gimplify.h.
* objc/objc-act.c: Include gimplify.h.
Index: ada/gcc-interface/trans.c
===================================================================
*** ada/gcc-interface/trans.c (revision 204496)
--- ada/gcc-interface/trans.c (working copy)
***************
*** 33,39 ****
#include "output.h"
#include "libfuncs.h" /* For set_stack_check_libfunc. */
#include "tree-iterator.h"
! #include "gimple.h"
#include "bitmap.h"
#include "cgraph.h"
#include "diagnostic.h"
--- 33,39 ----
#include "output.h"
#include "libfuncs.h" /* For set_stack_check_libfunc. */
#include "tree-iterator.h"
! #include "gimplify.h"
#include "bitmap.h"
#include "cgraph.h"
#include "diagnostic.h"
Index: c/c-typeck.c
===================================================================
*** c/c-typeck.c (revision 204496)
--- c/c-typeck.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 36,42 ****
#include "target.h"
#include "tree-iterator.h"
#include "bitmap.h"
! #include "gimple.h"
#include "tree-inline.h"
#include "omp-low.h"
#include "c-family/c-objc.h"
--- 36,42 ----
#include "target.h"
#include "tree-iterator.h"
#include "bitmap.h"
! #include "gimplify.h"
#include "tree-inline.h"
#include "omp-low.h"
#include "c-family/c-objc.h"
Index: c-family/c-common.c
===================================================================
*** c-family/c-common.c (revision 204496)
--- c-family/c-common.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 42,47 ****
--- 42,48 ----
#include "opts.h"
#include "cgraph.h"
#include "target-def.h"
+ #include "gimplify.h"
cpp_reader *parse_in; /* Declared in c-pragma.h. */
Index: c-family/c-gimplify.c
===================================================================
*** c-family/c-gimplify.c (revision 204496)
--- c-family/c-gimplify.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 29,35 ****
#include "tm.h"
#include "tree.h"
#include "c-common.h"
! #include "gimple.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
#include "langhooks.h"
--- 29,35 ----
#include "tm.h"
#include "tree.h"
#include "c-common.h"
! #include "gimplify.h"
#include "tree-inline.h"
#include "diagnostic-core.h"
#include "langhooks.h"
Index: c-family/cilk.c
===================================================================
*** c-family/cilk.c (revision 204496)
--- c-family/cilk.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 25,31 ****
#include "coretypes.h"
#include "tree.h"
#include "langhooks.h"
! #include "gimple.h"
#include "tree-iterator.h"
#include "tree-inline.h"
#include "c-family/c-common.h"
--- 25,31 ----
#include "coretypes.h"
#include "tree.h"
#include "langhooks.h"
! #include "gimplify.h"
#include "tree-iterator.h"
#include "tree-inline.h"
#include "c-family/c-common.h"
Index: c-family/c-omp.c
===================================================================
*** c-family/c-omp.c (revision 204496)
--- c-family/c-omp.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 27,33 ****
#include "tree.h"
#include "c-common.h"
#include "c-pragma.h"
! #include "gimple.h" /* For create_tmp_var_raw. */
#include "langhooks.h"
--- 27,33 ----
#include "tree.h"
#include "c-common.h"
#include "c-pragma.h"
! #include "gimple-expr.h"
#include "langhooks.h"
Index: c-family/c-ubsan.c
===================================================================
*** c-family/c-ubsan.c (revision 204496)
--- c-family/c-ubsan.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 24,30 ****
#include "tree.h"
#include "alloc-pool.h"
#include "cgraph.h"
- #include "gimple.h"
#include "output.h"
#include "toplev.h"
#include "ubsan.h"
--- 24,29 ----
Index: cp/class.c
===================================================================
*** cp/class.c (revision 204496)
--- cp/class.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 36,41 ****
--- 36,42 ----
#include "splay-tree.h"
#include "pointer-set.h"
#include "hash-table.h"
+ #include "gimplify.h"
/* The number of nested classes being processed. If we are not in the
scope of any class, this is zero. */
Index: cp/cp-gimplify.c
===================================================================
*** cp/cp-gimplify.c (revision 204496)
--- cp/cp-gimplify.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 27,33 ****
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "tree-iterator.h"
! #include "gimple.h"
#include "hashtab.h"
#include "pointer-set.h"
#include "flags.h"
--- 27,33 ----
#include "cp-tree.h"
#include "c-family/c-common.h"
#include "tree-iterator.h"
! #include "gimplify.h"
#include "hashtab.h"
#include "pointer-set.h"
#include "flags.h"
Index: cp/error.c
===================================================================
*** cp/error.c (revision 204496)
--- cp/error.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 33,38 ****
--- 33,39 ----
#include "pointer-set.h"
#include "c-family/c-objc.h"
#include "ubsan.h"
+ #include "gimplify.h"
#include <new> // For placement-new.
Index: cp/init.c
===================================================================
*** cp/init.c (revision 204496)
--- cp/init.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 28,33 ****
--- 28,34 ----
#include "cp-tree.h"
#include "flags.h"
#include "target.h"
+ #include "gimplify.h"
static bool begin_init_stmts (tree *, tree *);
static tree finish_init_stmts (bool, tree, tree);
Index: cp/optimize.c
===================================================================
*** cp/optimize.c (revision 204496)
--- cp/optimize.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 34,40 ****
#include "langhooks.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
! #include "gimple.h"
#include "tree-iterator.h"
#include "cgraph.h"
--- 34,40 ----
#include "langhooks.h"
#include "diagnostic-core.h"
#include "dumpfile.h"
! #include "gimplify.h"
#include "tree-iterator.h"
#include "cgraph.h"
Index: cp/pt.c
===================================================================
*** cp/pt.c (revision 204496)
--- cp/pt.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 42,47 ****
--- 42,48 ----
#include "timevar.h"
#include "tree-iterator.h"
#include "type-utils.h"
+ #include "gimplify.h"
/* The type of functions taking a tree, and some additional data, and
returning an int. */
Index: cp/semantics.c
===================================================================
*** cp/semantics.c (revision 204496)
--- cp/semantics.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 41,47 ****
#include "tree-iterator.h"
#include "vec.h"
#include "target.h"
! #include "gimple.h"
#include "bitmap.h"
#include "hash-table.h"
#include "omp-low.h"
--- 41,47 ----
#include "tree-iterator.h"
#include "vec.h"
#include "target.h"
! #include "gimplify.h"
#include "bitmap.h"
#include "hash-table.h"
#include "omp-low.h"
Index: cp/tree.c
===================================================================
*** cp/tree.c (revision 204496)
--- cp/tree.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
#include "convert.h"
#include "cgraph.h"
#include "splay-tree.h"
! #include "gimple.h" /* gimple_has_body_p */
#include "hash-table.h"
static tree bot_manip (tree *, int *, void *);
--- 30,36 ----
#include "convert.h"
#include "cgraph.h"
#include "splay-tree.h"
! #include "gimplify.h"
#include "hash-table.h"
static tree bot_manip (tree *, int *, void *);
Index: cp/vtable-class-hierarchy.c
===================================================================
*** cp/vtable-class-hierarchy.c (revision 204496)
--- cp/vtable-class-hierarchy.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 118,124 ****
#include "cgraph.h"
#include "tree-iterator.h"
#include "vtable-verify.h"
! #include "gimple.h"
static int num_calls_to_regset = 0;
static int num_calls_to_regpair = 0;
--- 118,124 ----
#include "cgraph.h"
#include "tree-iterator.h"
#include "vtable-verify.h"
! #include "gimplify.h"
static int num_calls_to_regset = 0;
static int num_calls_to_regpair = 0;
Index: cp/decl2.c
===================================================================
*** cp/decl2.c (revision 204496)
--- cp/decl2.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 45,51 ****
#include "c-family/c-pragma.h"
#include "dumpfile.h"
#include "intl.h"
- #include "gimple.h"
#include "pointer-set.h"
#include "splay-tree.h"
#include "langhooks.h"
--- 45,50 ----
Index: cp/except.c
===================================================================
*** cp/except.c (revision 204496)
--- cp/except.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 31,37 ****
#include "tree-inline.h"
#include "tree-iterator.h"
#include "target.h"
- #include "gimple.h"
static void push_eh_cleanup (tree);
static tree prepare_eh_type (tree);
--- 31,36 ----
Index: cp/method.c
===================================================================
*** cp/method.c (revision 204496)
--- cp/method.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 34,40 ****
#include "common/common-target.h"
#include "diagnostic.h"
#include "cgraph.h"
! #include "gimple.h"
/* Various flags to control the mangling process. */
--- 34,40 ----
#include "common/common-target.h"
#include "diagnostic.h"
#include "cgraph.h"
! #include "pointer-set.h"
/* Various flags to control the mangling process. */
Index: fortran/f95-lang.c
===================================================================
*** fortran/f95-lang.c (revision 204496)
--- fortran/f95-lang.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 28,34 ****
#include "system.h"
#include "coretypes.h"
#include "tree.h"
- #include "gimple.h"
#include "flags.h"
#include "langhooks.h"
#include "langhooks-def.h"
--- 28,33 ----
Index: fortran/trans-array.c
===================================================================
*** fortran/trans-array.c (revision 204496)
--- fortran/trans-array.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 79,85 ****
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimple.h" /* For create_tmp_var_name. */
#include "diagnostic-core.h" /* For internal_error/fatal_error. */
#include "flags.h"
#include "gfortran.h"
--- 79,85 ----
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimple-expr.h"
#include "diagnostic-core.h" /* For internal_error/fatal_error. */
#include "flags.h"
#include "gfortran.h"
Index: fortran/trans.c
===================================================================
*** fortran/trans.c (revision 204496)
--- fortran/trans.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 22,28 ****
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimple.h" /* For create_tmp_var_raw. */
#include "tree-iterator.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "flags.h"
--- 22,28 ----
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimple-expr.h" /* For create_tmp_var_raw. */
#include "tree-iterator.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "flags.h"
Index: fortran/trans-decl.c
===================================================================
*** fortran/trans-decl.c (revision 204496)
--- fortran/trans-decl.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 26,32 ****
#include "tm.h"
#include "tree.h"
#include "tree-dump.h"
! #include "gimple.h" /* For create_tmp_var_raw. */
#include "ggc.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "toplev.h" /* For announce_function. */
--- 26,32 ----
#include "tm.h"
#include "tree.h"
#include "tree-dump.h"
! #include "gimple-expr.h" /* For create_tmp_var_raw. */
#include "ggc.h"
#include "diagnostic-core.h" /* For internal_error. */
#include "toplev.h" /* For announce_function. */
Index: fortran/trans-expr.c
===================================================================
*** fortran/trans-expr.c (revision 204496)
--- fortran/trans-expr.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 38,43 ****
--- 38,44 ----
/* Only for gfc_trans_assign and gfc_trans_pointer_assign. */
#include "trans-stmt.h"
#include "dependency.h"
+ #include "gimplify.h"
/* Convert a scalar to an array descriptor. To be used for assumed-rank
Index: fortran/trans-openmp.c
===================================================================
*** fortran/trans-openmp.c (revision 204496)
--- fortran/trans-openmp.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 23,29 ****
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimple.h" /* For create_tmp_var_raw. */
#include "diagnostic-core.h" /* For internal_error. */
#include "gfortran.h"
#include "trans.h"
--- 23,29 ----
#include "system.h"
#include "coretypes.h"
#include "tree.h"
! #include "gimplify.h" /* For create_tmp_var_raw. */
#include "diagnostic-core.h" /* For internal_error. */
#include "gfortran.h"
#include "trans.h"
Index: go/go-lang.c
===================================================================
*** go/go-lang.c (revision 204496)
--- go/go-lang.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 23,29 ****
#include "coretypes.h"
#include "opts.h"
#include "tree.h"
! #include "gimple.h"
#include "ggc.h"
#include "toplev.h"
#include "debug.h"
--- 23,29 ----
#include "coretypes.h"
#include "opts.h"
#include "tree.h"
! #include "gimplify.h"
#include "ggc.h"
#include "toplev.h"
#include "debug.h"
Index: go/gofrontend/expressions.cc
===================================================================
*** go/gofrontend/expressions.cc (revision 204496)
--- go/gofrontend/expressions.cc (working copy)
***************
*** 12,17 ****
--- 12,18 ----
#include "intl.h"
#include "tree.h"
#include "gimple.h"
+ #include "gimplify.h"
#include "tree-iterator.h"
#include "convert.h"
#include "real.h"
Index: go/gofrontend/gogo-tree.cc
===================================================================
*** go/gofrontend/gogo-tree.cc (revision 204496)
--- go/gofrontend/gogo-tree.cc (working copy)
***************
*** 9,14 ****
--- 9,15 ----
#include "toplev.h"
#include "tree.h"
#include "gimple.h"
+ #include "gimplify.h"
#include "tree-iterator.h"
#include "cgraph.h"
#include "langhooks.h"
Index: go/gofrontend/types.cc
===================================================================
*** go/gofrontend/types.cc (revision 204496)
--- go/gofrontend/types.cc (working copy)
***************
*** 10,15 ****
--- 10,16 ----
#include "intl.h"
#include "tree.h"
#include "gimple.h"
+ #include "gimplify.h"
#include "real.h"
#include "convert.h"
Index: java/java-gimplify.c
===================================================================
*** java/java-gimplify.c (revision 204496)
--- java/java-gimplify.c (working copy)
*************** The Free Software Foundation is independ
*** 27,33 ****
#include "tree.h"
#include "java-tree.h"
#include "dumpfile.h"
! #include "gimple.h"
static tree java_gimplify_block (tree);
static enum gimplify_status java_gimplify_modify_expr (tree *);
--- 27,33 ----
#include "tree.h"
#include "java-tree.h"
#include "dumpfile.h"
! #include "gimplify.h"
static tree java_gimplify_block (tree);
static enum gimplify_status java_gimplify_modify_expr (tree *);
Index: objc/objc-act.c
===================================================================
*** objc/objc-act.c (revision 204496)
--- objc/objc-act.c (working copy)
*************** along with GCC; see the file COPYING3.
*** 60,66 ****
#include "tree-pretty-print.h"
/* For enum gimplify_status */
! #include "gimple.h"
/* For encode_method_prototype(). */
#include "objc-encoding.h"
--- 60,66 ----
#include "tree-pretty-print.h"
/* For enum gimplify_status */
! #include "gimplify.h"
/* For encode_method_prototype(). */
#include "objc-encoding.h"
