diff mbox

[2/3] Flatten gimple.h - fe changes

Message ID 528E4DFB.4040007@redhat.com
State New
Headers show

Commit Message

Andrew MacLeod Nov. 21, 2013, 6:16 p.m. UTC 
On 11/21/2013 01:15 PM, Andrew MacLeod wrote:
>
>
> The second patch has the language front end changes. its only the 
> ${language}-gimplify.c files which now actually require gimple.h 
> itself (yay).  I also trimmed out the #includes which were introduced 
> but not required there as well.

Comments

Jeff Law Nov. 21, 2013, 7:24 p.m. UTC | #1 
On 11/21/13 11:16, Andrew MacLeod wrote:
> On 11/21/2013 01:15 PM, Andrew MacLeod wrote:
>>
>>
>> The second patch has the language front end changes. its only the
>> ${language}-gimplify.c files which now actually require gimple.h
>> itself (yay).  I also trimmed out the #includes which were introduced
>> but not required there as well.
>
>
> gflat2.patch
>
>
> 	* ada/gcc-interface/trans.c: Add required include files from gimple.h.
>
> 	* c/c-typeck.c: Add required include files from gimple.h.
>
> 	* c-family/c-common.c: Add required include files from gimple.h.
> 	* c-family/c-gimplify.c: Likewise
> 	* c-family/cilk.c: Likewise
>
> 	* cp/class.c: Add required include files from gimple.h.
> 	* cp/cp-gimplify.c: Likewise
> 	* cp/decl2.c: Likewise
> 	* cp/init.c: Likewise
> 	* cp/optimize.c: Likewise
> 	* cp/pt.c: Likewise
> 	* cp/semantics.c: Likewise
> 	* cp/tree.c: Likewise
> 	* cp/typeck.c: Likewise
> 	* cp/vtable-class-hierarchy.c: Likewise
>
> 	* fortran/trans.c: Add required include files from gimple.h.
> 	* fortran/trans-expr.c: Likewise
> 	* fortran/trans-openmp.c: Likewise
>
> 	* go/gofrontend/expressions.cc: Add required include files from
> 	gimple.h.
> 	* go/gofrontend/gogo-tree.cc: Likewise
> 	* go/gofrontend/types.cc: Likewise
> 	* go/go-gcc.cc: Likewise
> 	* go/go-lang.c: Likewise
>
> 	* java/java-gimplify.c: Add required include files from gimple.h.
>
> 	* lto/lto.c: Add required include files from gimple.h.
> 	* lto/lto-lang.c: Likewise
> 	* lto/lto-object.c: Likewise
> 	* lto/lto-partition.c: Likewise
> 	* lto/lto-symtab.c: Likewise
>
> 	* objc/objc-act.c: Add required include files from gimple.h.
OK once prerequisites are approved.

JEFf
diff mbox

Patch


	* ada/gcc-interface/trans.c: Add required include files from gimple.h.

	* c/c-typeck.c: Add required include files from gimple.h.

	* c-family/c-common.c: Add required include files from gimple.h.
	* c-family/c-gimplify.c: Likewise
	* c-family/cilk.c: Likewise

	* cp/class.c: Add required include files from gimple.h.
	* cp/cp-gimplify.c: Likewise
	* cp/decl2.c: Likewise
	* cp/init.c: Likewise
	* cp/optimize.c: Likewise
	* cp/pt.c: Likewise
	* cp/semantics.c: Likewise
	* cp/tree.c: Likewise
	* cp/typeck.c: Likewise
	* cp/vtable-class-hierarchy.c: Likewise

	* fortran/trans.c: Add required include files from gimple.h.
	* fortran/trans-expr.c: Likewise
	* fortran/trans-openmp.c: Likewise

	* go/gofrontend/expressions.cc: Add required include files from
	gimple.h.
	* go/gofrontend/gogo-tree.cc: Likewise
	* go/gofrontend/types.cc: Likewise
	* go/go-gcc.cc: Likewise
	* go/go-lang.c: Likewise

	* java/java-gimplify.c: Add required include files from gimple.h.

	* lto/lto.c: Add required include files from gimple.h.
	* lto/lto-lang.c: Likewise
	* lto/lto-object.c: Likewise
	* lto/lto-partition.c: Likewise
	* lto/lto-symtab.c: Likewise

	* objc/objc-act.c: Add required include files from gimple.h.

Index: ada/gcc-interface/trans.c
===================================================================
*** ada/gcc-interface/trans.c	(revision 205213)
--- ada/gcc-interface/trans.c	(working copy)
***************
*** 33,45 ****
  #include "stmt.h"
  #include "varasm.h"
  #include "flags.h"
- #include "ggc.h"
  #include "output.h"
  #include "libfuncs.h"	/* For set_stack_check_libfunc.  */
  #include "tree-iterator.h"
- #include "gimple.h"
- #include "gimplify.h"
  #include "pointer-set.h"
  #include "bitmap.h"
  #include "cgraph.h"
  #include "diagnostic.h"
--- 33,44 ----
  #include "stmt.h"
  #include "varasm.h"
  #include "flags.h"
  #include "output.h"
  #include "libfuncs.h"	/* For set_stack_check_libfunc.  */
  #include "tree-iterator.h"
  #include "pointer-set.h"
+ #include "gimple-expr.h"
+ #include "gimplify.h"
  #include "bitmap.h"
  #include "cgraph.h"
  #include "diagnostic.h"
Index: c/c-typeck.c
===================================================================
*** c/c-typeck.c	(revision 205213)
--- c/c-typeck.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 40,46 ****
  #include "target.h"
  #include "tree-iterator.h"
  #include "bitmap.h"
! #include "gimple.h"
  #include "gimplify.h"
  #include "tree-inline.h"
  #include "omp-low.h"
--- 40,48 ----
  #include "target.h"
  #include "tree-iterator.h"
  #include "bitmap.h"
! #include "pointer-set.h"
! #include "basic-block.h"
! #include "gimple-expr.h"
  #include "gimplify.h"
  #include "tree-inline.h"
  #include "omp-low.h"
Index: c-family/c-common.c
===================================================================
*** c-family/c-common.c	(revision 205213)
--- c-family/c-common.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 32,38 ****
  #include "trans-mem.h"
  #include "flags.h"
  #include "c-pragma.h"
- #include "ggc.h"
  #include "c-common.h"
  #include "c-objc.h"
  #include "tm_p.h"
--- 32,37 ----
*************** along with GCC; see the file COPYING3.
*** 49,55 ****
  #include "opts.h"
  #include "cgraph.h"
  #include "target-def.h"
- #include "gimple.h"
  #include "gimplify.h"
  
  cpp_reader *parse_in;		/* Declared in c-pragma.h.  */
--- 48,53 ----
Index: c-family/c-gimplify.c
===================================================================
*** c-family/c-gimplify.c	(revision 205213)
--- c-family/c-gimplify.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 29,34 ****
--- 29,39 ----
  #include "tm.h"
  #include "tree.h"
  #include "c-common.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "tree-inline.h"
Index: c-family/cilk.c
===================================================================
*** c-family/cilk.c	(revision 205213)
--- c-family/cilk.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 27,33 ****
  #include "stringpool.h"
  #include "calls.h"
  #include "langhooks.h"
! #include "gimple.h"
  #include "gimplify.h"
  #include "tree-iterator.h"
  #include "tree-inline.h"
--- 27,34 ----
  #include "stringpool.h"
  #include "calls.h"
  #include "langhooks.h"
! #include "pointer-set.h"
! #include "gimple-expr.h"
  #include "gimplify.h"
  #include "tree-iterator.h"
  #include "tree-inline.h"
Index: cp/class.c
===================================================================
*** cp/class.c	(revision 205213)
--- cp/class.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 29,35 ****
  #include "stringpool.h"
  #include "stor-layout.h"
  #include "attribs.h"
! #include "gimple.h"
  #include "cp-tree.h"
  #include "flags.h"
  #include "toplev.h"
--- 29,36 ----
  #include "stringpool.h"
  #include "stor-layout.h"
  #include "attribs.h"
! #include "pointer-set.h"
! #include "hash-table.h"
  #include "cp-tree.h"
  #include "flags.h"
  #include "toplev.h"
*************** along with GCC; see the file COPYING3.
*** 38,46 ****
  #include "cgraph.h"
  #include "dumpfile.h"
  #include "splay-tree.h"
- #include "pointer-set.h"
- #include "hash-table.h"
- #include "gimple.h"
  #include "gimplify.h"
  
  /* The number of nested classes being processed.  If we are not in the
--- 39,44 ----
Index: cp/cp-gimplify.c
===================================================================
*** cp/cp-gimplify.c	(revision 205213)
--- cp/cp-gimplify.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 28,37 ****
  #include "cp-tree.h"
  #include "c-family/c-common.h"
  #include "tree-iterator.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "hashtab.h"
- #include "pointer-set.h"
  #include "flags.h"
  #include "splay-tree.h"
  
--- 28,42 ----
  #include "cp-tree.h"
  #include "c-family/c-common.h"
  #include "tree-iterator.h"
+ #include "pointer-set.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  #include "hashtab.h"
  #include "flags.h"
  #include "splay-tree.h"
  
Index: cp/decl2.c
===================================================================
*** cp/decl2.c	(revision 205213)
--- cp/decl2.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 36,42 ****
  #include "attribs.h"
  #include "stor-layout.h"
  #include "calls.h"
! #include "gimple.h"
  #include "flags.h"
  #include "cp-tree.h"
  #include "decl.h"
--- 36,42 ----
  #include "attribs.h"
  #include "stor-layout.h"
  #include "calls.h"
! #include "pointer-set.h"
  #include "flags.h"
  #include "cp-tree.h"
  #include "decl.h"
*************** along with GCC; see the file COPYING3.
*** 51,57 ****
  #include "c-family/c-pragma.h"
  #include "dumpfile.h"
  #include "intl.h"
- #include "pointer-set.h"
  #include "splay-tree.h"
  #include "langhooks.h"
  #include "c-family/c-ada-spec.h"
--- 51,56 ----
Index: cp/init.c
===================================================================
*** cp/init.c	(revision 205213)
--- cp/init.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 30,36 ****
  #include "cp-tree.h"
  #include "flags.h"
  #include "target.h"
- #include "gimple.h"
  #include "gimplify.h"
  
  static bool begin_init_stmts (tree *, tree *);
--- 30,35 ----
Index: cp/optimize.c
===================================================================
*** cp/optimize.c	(revision 205213)
--- cp/optimize.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 35,41 ****
  #include "langhooks.h"
  #include "diagnostic-core.h"
  #include "dumpfile.h"
! #include "gimple.h"
  #include "tree-iterator.h"
  #include "cgraph.h"
  
--- 35,41 ----
  #include "langhooks.h"
  #include "diagnostic-core.h"
  #include "dumpfile.h"
! #include "pointer-set.h"
  #include "tree-iterator.h"
  #include "cgraph.h"
  
Index: cp/pt.c
===================================================================
*** cp/pt.c	(revision 205213)
--- cp/pt.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 46,52 ****
  #include "timevar.h"
  #include "tree-iterator.h"
  #include "type-utils.h"
- #include "gimple.h"
  #include "gimplify.h"
  
  /* The type of functions taking a tree, and some additional data, and
--- 46,51 ----
Index: cp/semantics.c
===================================================================
*** cp/semantics.c	(revision 205213)
--- cp/semantics.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 43,54 ****
  #include "diagnostic.h"
  #include "cgraph.h"
  #include "tree-iterator.h"
- #include "vec.h"
  #include "target.h"
! #include "gimple.h"
  #include "gimplify.h"
  #include "bitmap.h"
- #include "hash-table.h"
  #include "omp-low.h"
  
  static bool verify_constant (tree, bool, bool *, bool *);
--- 43,53 ----
  #include "diagnostic.h"
  #include "cgraph.h"
  #include "tree-iterator.h"
  #include "target.h"
! #include "pointer-set.h"
! #include "hash-table.h"
  #include "gimplify.h"
  #include "bitmap.h"
  #include "omp-low.h"
  
  static bool verify_constant (tree, bool, bool *, bool *);
Index: cp/tree.c
===================================================================
*** cp/tree.c	(revision 205213)
--- cp/tree.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 33,41 ****
  #include "convert.h"
  #include "cgraph.h"
  #include "splay-tree.h"
- #include "gimple.h"
- #include "gimplify.h"
  #include "hash-table.h"
  
  static tree bot_manip (tree *, int *, void *);
  static tree bot_replace (tree *, int *, void *);
--- 33,41 ----
  #include "convert.h"
  #include "cgraph.h"
  #include "splay-tree.h"
  #include "hash-table.h"
+ #include "gimple-expr.h"
+ #include "gimplify.h"
  
  static tree bot_manip (tree *, int *, void *);
  static tree bot_replace (tree *, int *, void *);
Index: cp/typeck.c
===================================================================
*** cp/typeck.c	(revision 205213)
--- cp/typeck.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 31,37 ****
  #include "tree.h"
  #include "stor-layout.h"
  #include "varasm.h"
- #include "gimple.h"
  #include "cp-tree.h"
  #include "flags.h"
  #include "diagnostic.h"
--- 31,36 ----
Index: cp/vtable-class-hierarchy.c
===================================================================
*** cp/vtable-class-hierarchy.c	(revision 205213)
--- 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"
  #include "gimplify.h"
  #include "stringpool.h"
  #include "stor-layout.h"
--- 118,123 ----
Index: fortran/trans.c
===================================================================
*** fortran/trans.c	(revision 205213)
--- fortran/trans.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 23,29 ****
  #include "coretypes.h"
  #include "tree.h"
  #include "gimple-expr.h"	/* For create_tmp_var_raw.  */
- #include "gimple.h"
  #include "stringpool.h"
  #include "tree-iterator.h"
  #include "diagnostic-core.h"  /* For internal_error.  */
--- 23,28 ----
Index: fortran/trans-expr.c
===================================================================
*** fortran/trans-expr.c	(revision 205213)
--- fortran/trans-expr.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 39,45 ****
  /* Only for gfc_trans_assign and gfc_trans_pointer_assign.  */
  #include "trans-stmt.h"
  #include "dependency.h"
- #include "gimple.h"
  #include "gimplify.h"
  
  
--- 39,44 ----
Index: fortran/trans-openmp.c
===================================================================
*** fortran/trans-openmp.c	(revision 205213)
--- 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"
  #include "gimplify.h"	/* For create_tmp_var_raw.  */
  #include "stringpool.h"
  #include "diagnostic-core.h"	/* For internal_error.  */
--- 23,29 ----
  #include "system.h"
  #include "coretypes.h"
  #include "tree.h"
! #include "gimple-expr.h"
  #include "gimplify.h"	/* For create_tmp_var_raw.  */
  #include "stringpool.h"
  #include "diagnostic-core.h"	/* For internal_error.  */
Index: go/gofrontend/expressions.cc
===================================================================
*** go/gofrontend/expressions.cc	(revision 205213)
--- go/gofrontend/expressions.cc	(working copy)
***************
*** 13,20 ****
  #include "tree.h"
  #include "stringpool.h"
  #include "stor-layout.h"
! #include "gimple.h"
! #include "gimplify.h"
  #include "tree-iterator.h"
  #include "convert.h"
  #include "real.h"
--- 13,19 ----
  #include "tree.h"
  #include "stringpool.h"
  #include "stor-layout.h"
! #include "gimple-expr.h"
  #include "tree-iterator.h"
  #include "convert.h"
  #include "real.h"
Index: go/gofrontend/gogo-tree.cc
===================================================================
*** go/gofrontend/gogo-tree.cc	(revision 205213)
--- go/gofrontend/gogo-tree.cc	(working copy)
***************
*** 11,17 ****
  #include "stringpool.h"
  #include "stor-layout.h"
  #include "varasm.h"
! #include "gimple.h"
  #include "gimplify.h"
  #include "tree-iterator.h"
  #include "cgraph.h"
--- 11,17 ----
  #include "stringpool.h"
  #include "stor-layout.h"
  #include "varasm.h"
! #include "gimple-expr.h"
  #include "gimplify.h"
  #include "tree-iterator.h"
  #include "cgraph.h"
Index: go/gofrontend/types.cc
===================================================================
*** go/gofrontend/types.cc	(revision 205213)
--- go/gofrontend/types.cc	(working copy)
***************
*** 9,16 ****
  #include "toplev.h"
  #include "intl.h"
  #include "tree.h"
- #include "gimple.h"
- #include "gimplify.h"
  #include "real.h"
  #include "convert.h"
  
--- 9,14 ----
Index: go/go-gcc.cc
===================================================================
*** go/go-gcc.cc	(revision 205213)
--- go/go-gcc.cc	(working copy)
***************
*** 29,35 ****
  #include "stor-layout.h"
  #include "varasm.h"
  #include "tree-iterator.h"
! #include "gimple.h"
  #include "toplev.h"
  #include "output.h"
  #include "real.h"
--- 29,36 ----
  #include "stor-layout.h"
  #include "varasm.h"
  #include "tree-iterator.h"
! #include "basic-block.h"
! #include "gimple-expr.h"
  #include "toplev.h"
  #include "output.h"
  #include "real.h"
Index: go/go-lang.c
===================================================================
*** go/go-lang.c	(revision 205213)
--- go/go-lang.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 23,32 ****
  #include "coretypes.h"
  #include "opts.h"
  #include "tree.h"
! #include "gimple.h"
  #include "gimplify.h"
  #include "stor-layout.h"
- #include "ggc.h"
  #include "toplev.h"
  #include "debug.h"
  #include "options.h"
--- 23,32 ----
  #include "coretypes.h"
  #include "opts.h"
  #include "tree.h"
! #include "basic-block.h"
! #include "gimple-expr.h"
  #include "gimplify.h"
  #include "stor-layout.h"
  #include "toplev.h"
  #include "debug.h"
  #include "options.h"
Index: java/java-gimplify.c
===================================================================
*** java/java-gimplify.c	(revision 205213)
--- java/java-gimplify.c	(working copy)
*************** The Free Software Foundation is independ
*** 27,32 ****
--- 27,37 ----
  #include "tree.h"
  #include "java-tree.h"
  #include "dumpfile.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "gimplify.h"
  
Index: lto/lto.c
===================================================================
*** lto/lto.c	(revision 205213)
--- lto/lto.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 28,43 ****
  #include "diagnostic-core.h"
  #include "tm.h"
  #include "cgraph.h"
- #include "ggc.h"
  #include "tree-ssa-operands.h"
  #include "tree-pass.h"
  #include "langhooks.h"
- #include "vec.h"
  #include "bitmap.h"
- #include "pointer-set.h"
  #include "ipa-prop.h"
  #include "common.h"
  #include "debug.h"
  #include "gimple.h"
  #include "lto.h"
  #include "lto-tree.h"
--- 28,44 ----
  #include "diagnostic-core.h"
  #include "tm.h"
  #include "cgraph.h"
  #include "tree-ssa-operands.h"
  #include "tree-pass.h"
  #include "langhooks.h"
  #include "bitmap.h"
  #include "ipa-prop.h"
  #include "common.h"
  #include "debug.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "lto.h"
  #include "lto-tree.h"
Index: lto/lto-lang.c
===================================================================
*** lto/lto-lang.c	(revision 205213)
--- lto/lto-lang.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 33,38 ****
--- 33,43 ----
  #include "lto-tree.h"
  #include "lto.h"
  #include "tree-inline.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "diagnostic-core.h"
  #include "toplev.h"
*************** lto_tree_node_structure (union lang_tree
*** 1303,1308 ****
    return TS_LTO_GENERIC;
  }
  
- #include "ggc.h"
  #include "gtype-lto.h"
  #include "gt-lto-lto-lang.h"
--- 1308,1312 ----
Index: lto/lto-object.c
===================================================================
*** lto/lto-object.c	(revision 205213)
--- lto/lto-object.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 22,27 ****
--- 22,32 ----
  #include "system.h"
  #include "coretypes.h"
  #include "tree.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "diagnostic-core.h"
  #include "lto.h"
Index: lto/lto-partition.c
===================================================================
*** lto/lto-partition.c	(revision 205213)
--- lto/lto-partition.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 23,28 ****
--- 23,33 ----
  #include "toplev.h"
  #include "tree.h"
  #include "gcc-symtab.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "tm.h"
  #include "cgraph.h"
Index: lto/lto-symtab.c
===================================================================
*** lto/lto-symtab.c	(revision 205213)
--- lto/lto-symtab.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 23,30 ****
  #include "coretypes.h"
  #include "diagnostic-core.h"
  #include "tree.h"
  #include "gimple.h"
- #include "ggc.h"
  #include "hashtab.h"
  #include "plugin-api.h"
  #include "lto-streamer.h"
--- 23,34 ----
  #include "coretypes.h"
  #include "diagnostic-core.h"
  #include "tree.h"
+ #include "basic-block.h"
+ #include "tree-ssa-alias.h"
+ #include "internal-fn.h"
+ #include "gimple-expr.h"
+ #include "is-a.h"
  #include "gimple.h"
  #include "hashtab.h"
  #include "plugin-api.h"
  #include "lto-streamer.h"
Index: objc/objc-act.c
===================================================================
*** objc/objc-act.c	(revision 205213)
--- objc/objc-act.c	(working copy)
*************** along with GCC; see the file COPYING3.
*** 45,51 ****
  #include "input.h"
  #include "function.h"
  #include "toplev.h"
- #include "ggc.h"
  #include "debug.h"
  #include "c-family/c-target.h"
  #include "diagnostic-core.h"
--- 45,50 ----
*************** along with GCC; see the file COPYING3.
*** 63,69 ****
  #include "tree-pretty-print.h"
  
  /* For enum gimplify_status */
! #include "gimple.h"
  #include "gimplify.h"
  
  /* For encode_method_prototype().  */
--- 62,68 ----
  #include "tree-pretty-print.h"
  
  /* For enum gimplify_status */
! #include "gimple-expr.h"
  #include "gimplify.h"
  
  /* For encode_method_prototype().  */