From 48d859bb420e2f7ac0bf7966bd43c15330c64dbc Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Wed, 15 Jul 2015 19:57:03 +0000 Subject: [PATCH] gimple-pretty-print.h: Don't include pretty-print.h. * gimple-pretty-print.h: Don't include pretty-print.h. * tree-streamer.h: Don't include lto-streamer.h. * gimple-streamer.h: Include tree-streamer.h rather than lto-streamer.h. * gimple-streamer-in.c: Remove redundant includes. * gimple-streamer-out.c: Likewise. * ipa-devirt.c: Likewise. * ipa-icf.c: Likewise. * ipa-inline-analysis.c: Likewise. * ipa-polymorphic-call.c: Likewise. * ipa-profile.c: Likewise. * ipa-prop.c: Likewise. * ipa-pure-const.c: Likewise. * lto-cgraph.c: Likewise. * lto-streamer-in.c: Likewise. * lto-streamer-out.c: Likewise. * lto-streamer.c: Likewise. * tree-streamer-in.c: Likewise. * tree-streamer-out.c: Likewise. * tree-streamer.c: Likewise. * lto/lto.c: Remove redundant includes. From-SVN: r225847 --- gcc/ChangeLog | 22 ++++++++++++++++++++++ gcc/gimple-pretty-print.h | 1 - gcc/gimple-streamer-in.c | 2 -- gcc/gimple-streamer-out.c | 3 --- gcc/gimple-streamer.h | 2 +- gcc/ipa-devirt.c | 2 -- gcc/ipa-icf.c | 1 - gcc/ipa-inline-analysis.c | 2 -- gcc/ipa-polymorphic-call.c | 2 -- gcc/ipa-profile.c | 1 - gcc/ipa-prop.c | 2 -- gcc/ipa-pure-const.c | 2 -- gcc/lto-cgraph.c | 2 -- gcc/lto-streamer-in.c | 4 ---- gcc/lto-streamer-out.c | 4 ---- gcc/lto-streamer.c | 1 - gcc/lto/ChangeLog | 4 ++++ gcc/lto/lto.c | 4 +--- gcc/tree-streamer-in.c | 2 -- gcc/tree-streamer-out.c | 2 -- gcc/tree-streamer.c | 3 +-- gcc/tree-streamer.h | 1 - 22 files changed, 29 insertions(+), 40 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6186f5b3c3e..583309f42da 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,25 @@ +2015-07-15 Andrew MacLeod + + * gimple-pretty-print.h: Don't include pretty-print.h. + * tree-streamer.h: Don't include lto-streamer.h. + * gimple-streamer.h: Include tree-streamer.h rather than lto-streamer.h. + * gimple-streamer-in.c: Remove redundant includes. + * gimple-streamer-out.c: Likewise. + * ipa-devirt.c: Likewise. + * ipa-icf.c: Likewise. + * ipa-inline-analysis.c: Likewise. + * ipa-polymorphic-call.c: Likewise. + * ipa-profile.c: Likewise. + * ipa-prop.c: Likewise. + * ipa-pure-const.c: Likewise. + * lto-cgraph.c: Likewise. + * lto-streamer-in.c: Likewise. + * lto-streamer-out.c: Likewise. + * lto-streamer.c: Likewise. + * tree-streamer-in.c: Likewise. + * tree-streamer-out.c: Likewise. + * tree-streamer.c: Likewise. + 2015-07-15 Andrew MacLeod * opth-gen.awk: Check for UNKNOWN_LOCATION rather than GCC_TM_H, don't diff --git a/gcc/gimple-pretty-print.h b/gcc/gimple-pretty-print.h index 883a7a3a50c..587e5370434 100644 --- a/gcc/gimple-pretty-print.h +++ b/gcc/gimple-pretty-print.h @@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_GIMPLE_PRETTY_PRINT_H #define GCC_GIMPLE_PRETTY_PRINT_H -#include "pretty-print.h" #include "tree-pretty-print.h" /* In gimple-pretty-print.c */ diff --git a/gcc/gimple-streamer-in.c b/gcc/gimple-streamer-in.c index 33a5148011e..9659822c267 100644 --- a/gcc/gimple-streamer-in.c +++ b/gcc/gimple-streamer-in.c @@ -35,8 +35,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-eh.h" #include "gimple-iterator.h" #include "cgraph.h" -#include "data-streamer.h" -#include "tree-streamer.h" #include "gimple-streamer.h" #include "value-prof.h" diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c index aa50e553753..e5a48af7385 100644 --- a/gcc/gimple-streamer-out.c +++ b/gcc/gimple-streamer-out.c @@ -34,10 +34,7 @@ along with GCC; see the file COPYING3. If not see #include "gimple-iterator.h" #include "gimple-ssa.h" #include "cgraph.h" -#include "data-streamer.h" #include "gimple-streamer.h" -#include "lto-streamer.h" -#include "tree-streamer.h" #include "value-prof.h" /* Output PHI function PHI to the main stream in OB. */ diff --git a/gcc/gimple-streamer.h b/gcc/gimple-streamer.h index d77f33d1061..4cb8a5f403e 100644 --- a/gcc/gimple-streamer.h +++ b/gcc/gimple-streamer.h @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see #ifndef GCC_GIMPLE_STREAMER_H #define GCC_GIMPLE_STREAMER_H -#include "lto-streamer.h" +#include "tree-streamer.h" /* In gimple-streamer-in.c */ void input_bb (struct lto_input_block *, enum LTO_tags, struct data_in *, diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 49cb65b0d19..b7afc3bedad 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -128,7 +128,6 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "tree-pass.h" #include "target.h" -#include "tree-pretty-print.h" #include "ipa-utils.h" #include "internal-fn.h" #include "gimple-fold.h" @@ -143,7 +142,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-pretty-print.h" #include "stor-layout.h" #include "intl.h" -#include "streamer-hooks.h" #include "lto-streamer.h" /* Hash based set of pairs of types. */ diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c index 13a93200f80..3597b3a185e 100644 --- a/gcc/ipa-icf.c +++ b/gcc/ipa-icf.c @@ -90,7 +90,6 @@ along with GCC; see the file COPYING3. If not see #include "attribs.h" #include "print-tree.h" #include "target.h" -#include "lto-streamer.h" #include "data-streamer.h" #include "ipa-utils.h" #include "ipa-icf-gimple.h" diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index 81a6860f114..0c137d82804 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -94,8 +94,6 @@ along with GCC; see the file COPYING3. If not see #include "alloc-pool.h" #include "symbol-summary.h" #include "ipa-prop.h" -#include "lto-streamer.h" -#include "data-streamer.h" #include "tree-streamer.h" #include "ipa-inline.h" #include "cfgloop.h" diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c index 458e1e93246..fd3fb196886 100644 --- a/gcc/ipa-polymorphic-call.c +++ b/gcc/ipa-polymorphic-call.c @@ -40,7 +40,6 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "tree-pass.h" #include "target.h" -#include "tree-pretty-print.h" #include "cgraph.h" #include "ipa-utils.h" #include "internal-fn.h" @@ -57,7 +56,6 @@ along with GCC; see the file COPYING3. If not see #include "stor-layout.h" #include "intl.h" #include "data-streamer.h" -#include "lto-streamer.h" #include "streamer-hooks.h" #include "tree-ssa-operands.h" #include "tree-into-ssa.h" diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c index 82912669321..3b99687be00 100644 --- a/gcc/ipa-profile.c +++ b/gcc/ipa-profile.c @@ -67,7 +67,6 @@ along with GCC; see the file COPYING3. If not see #include "value-prof.h" #include "alloc-pool.h" #include "tree-inline.h" -#include "lto-streamer.h" #include "data-streamer.h" #include "symbol-summary.h" #include "ipa-prop.h" diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 615f749f8fd..77fc6b500a0 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -61,8 +61,6 @@ along with GCC; see the file COPYING3. If not see #include "ipa-inline.h" #include "diagnostic.h" #include "gimple-pretty-print.h" -#include "lto-streamer.h" -#include "data-streamer.h" #include "tree-streamer.h" #include "params.h" #include "ipa-utils.h" diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c index f0373e65d8f..8fd8c365bb4 100644 --- a/gcc/ipa-pure-const.c +++ b/gcc/ipa-pure-const.c @@ -59,8 +59,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-pretty-print.h" #include "langhooks.h" #include "target.h" -#include "lto-streamer.h" -#include "data-streamer.h" #include "tree-streamer.h" #include "cfgloop.h" #include "tree-scalar-evolution.h" diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index f700b0ce16d..d70537dbd07 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -48,8 +48,6 @@ along with GCC; see the file COPYING3. If not see #include "except.h" #include "timevar.h" #include "cgraph.h" -#include "lto-streamer.h" -#include "data-streamer.h" #include "tree-streamer.h" #include "gcov-io.h" #include "tree-pass.h" diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index a9e31b1284c..a56d3f3f8f4 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -56,11 +56,7 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "ipa-utils.h" #include "target.h" -#include "data-streamer.h" #include "gimple-streamer.h" -#include "lto-streamer.h" -#include "tree-streamer.h" -#include "streamer-hooks.h" #include "cfgloop.h" diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 8dcfcf57c59..2d048e81b30 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -50,11 +50,7 @@ along with GCC; see the file COPYING3. If not see #include "lto-symtab.h" #include "cgraph.h" #include "target.h" -#include "lto-streamer.h" -#include "data-streamer.h" #include "gimple-streamer.h" -#include "tree-streamer.h" -#include "streamer-hooks.h" #include "cfgloop.h" #include "builtins.h" #include "gomp-constants.h" diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c index 57e6ea55ccd..b34ab8bc01a 100644 --- a/gcc/lto-streamer.c +++ b/gcc/lto-streamer.c @@ -37,7 +37,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-streamer.h" #include "lto-streamer.h" #include "lto-section-names.h" -#include "streamer-hooks.h" /* Statistics gathered during LTO, WPA and LTRANS. */ struct lto_stats_d lto_stats; diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 97f12f681cd..bce03464fec 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,7 @@ +2015-07-15 Andrew MacLeod + + * lto.c: Remove redundant includes. + 2015-07-12 Aldy Hernandez * lto-lang.c: Fix double word typos. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index 2d80ffec61a..7ec4c08a39e 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -48,12 +48,10 @@ along with GCC; see the file COPYING3. If not see #include "internal-fn.h" #include "lto.h" #include "lto-tree.h" -#include "lto-streamer.h" -#include "lto-section-names.h" #include "tree-streamer.h" +#include "lto-section-names.h" #include "splay-tree.h" #include "lto-partition.h" -#include "data-streamer.h" #include "context.h" #include "pass_manager.h" #include "ipa-inline.h" diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index 14ecfbedbdd..6a213370f13 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -35,8 +35,6 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "target.h" #include "tree-streamer.h" -#include "data-streamer.h" -#include "streamer-hooks.h" #include "builtins.h" #include "ipa-chkp.h" #include "gomp-constants.h" diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c index a0c46652c34..5b263d7e57b 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -34,8 +34,6 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "target.h" #include "tree-streamer.h" -#include "data-streamer.h" -#include "streamer-hooks.h" #include "gomp-constants.h" diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c index c66e1743106..fe9a8c938c4 100644 --- a/gcc/tree-streamer.c +++ b/gcc/tree-streamer.c @@ -31,9 +31,8 @@ along with GCC; see the file COPYING3. If not see #include "options.h" #include "fold-const.h" #include "internal-fn.h" -#include "streamer-hooks.h" -#include "cgraph.h" #include "tree-streamer.h" +#include "cgraph.h" /* Table indexed by machine_mode, used for 2 different purposes. During streaming out we record there non-zero value for all modes diff --git a/gcc/tree-streamer.h b/gcc/tree-streamer.h index fdd86664f29..4e95a73a7d0 100644 --- a/gcc/tree-streamer.h +++ b/gcc/tree-streamer.h @@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see #define GCC_TREE_STREAMER_H #include "streamer-hooks.h" -#include "lto-streamer.h" #include "data-streamer.h" /* Cache of pickled nodes. Used to avoid writing the same node more -- 2.30.2