This is a final part of two part patch that flattens gimple-streamer.h,
lto-streamer.h and tree-streamer.h.
This patch modifies all source files that previously included the three
streamer header files to now include the header file(s) that contains
the exports that it needs.
I performed a full bootstrap with all languages on x86-linux. I also
bootstrapped on all targets listed in contrib/config-list.mk with c and
c++ enabled.
Is this okay for trunk?
2014-11-19 Michael Collison <michael.colli...@linaro.org>
* builtins.c: Remove include of lto-streamer.h.
Include plugin-api.h and gcov-io.h
* cgraph.h: Include gcov-io.h and lto-streamer-in.h.
* config/darwin.c: Inlude gcov-io.h.
* config/i386/winnt.c: ditto.
* data-streamer-in.c: ditto
* data-streamer.c: Include gcov-io.h and diagnostic.h.
* data-streamer-out.c: ditto.
* gimple-streamer-in.c: Include gcov-io.h, streamer-hooks.h,
tree-streamer-in.h,
lto-streamer-in.h, and gimple-streamer-in.h.
Remove include of gimple-streamer.h.
* gimple-streamer-out.c: Include gcov-io.h, diagnostic.h,
gimple-streamer-out.h,
and streamer-hooks.h.
Remove include of gimple-streamer.h.
* ipa-chkp.c: Include plugin-api.h, gcov-io.h, hash-map.h.h, and
diagnostic.h.
Remove include of lto-streamer.h.
* ipa-icf.c: Include diagnostic.h, lto-streamer-in.h and
lto-streamer-out.h.
* ipa-icf-gimple.c: Include gcov-io.h and diagnostic.h.
* ipa-inline-analysis.c: Include lto-streamer-in.h,
lto-streamer-out.h, and
streamer-hooks.h.
* ipa-polymorphic-call.c: Include gcov-io.h.
* ipa-pure-const.c: ditto.
* ipa-reference.c: ditto.
* ipa-utils.c: ditto.
* ipa-profile.c: Include gcov-io.h and diagnostic.h.
* ipa-prop.c: Include gcov-io.h, plugin-api.h, lto-streamer-in.h,
lto-streamer-in.h, lto-streamer-out.h, and streamer-hooks.h.
* lto/lto.c: Include gcov-io.h, target.h, and lto-streamer-in.h.
* lto/lto-lang.c: Include gcov-io.h.
* lto/lto-object.c: ditto.
* lto/lto-partition.c: Include gcov-io.h and diagnostic.h.
* lto/lto-symtab.c: Include gcov-io.h and target.h.
* lto-cgraph.c: Include gcov-io.h, lto-streamer-in.h and
lto-streamer-out.h,
and streamer-hooks.h,
* lto-compress.c: Include gcov-io.h.
* lto-opts.c: ditto.
* lto-section-in.c: ditto.
* lto-sectio-out.c: Include gcov-io.h and diagnostic.h.
* lto-streamer.c: Include gcov-io.h, lto-streamer-in.h, and
lto-streamer-out.h.
* lto-streamer-in.c: Include gcov-io.h, target.h, gimple-streamer-in.h,
lto-streamer-in.h and tree-strreamer-in.h.
(lto-input_tree_ref): Add static prototype and make definition static.
(lto_input_data_block): Delete unused function.
* lto-streamer-out.c: Include gcov-io.h, target.h,
gimple-streamer-out.h
and tree-streamer-out.h.
Remove include of gimple-streamer.h.
(lto_output_decl_state_streams): Add static prototype and make
definition static.
(lto_output_decl_state_refs): Add static prototype and make
definition static.
* opts-global.c: Include gcov-io.h.
* passes.c: Include lto-streamer-out.h.
* symtab.c: Include gcov-io.h and target.h.
* tree-chkp.c: Include plugin-api.h and gcov-io.h.
Remove include of lto-streamer.h.
* tree-streamer.c: Include gcov-io.h, diagnostic.h and lto-streamer.h.
* tree-streamer-in.c: Include gcov-io.h, target.h, and
lto-streamer-in.h.
* tree-streamer-out.c: Include gcov-io.h, target.h, and lto-streamer.h.
* varpool.c: Include gcov-io.h and lto-streamer-in.h.
--
Michael Collison
Linaro Toolchain Working Group
michael.colli...@linaro.org
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/builtins.c
gcc-trunk-streamer/gcc/builtins.c
*** gcc-trunk/gcc/builtins.c 2014-11-05 14:33:13.751782986 -0700
--- gcc-trunk-streamer/gcc/builtins.c 2014-11-10 22:57:43.999819384 -0700
***************
*** 67,73 ****
#include "ubsan.h"
#include "cilk.h"
#include "ipa-ref.h"
! #include "lto-streamer.h"
#include "cgraph.h"
#include "tree-chkp.h"
#include "rtl-chkp.h"
--- 67,74 ----
#include "ubsan.h"
#include "cilk.h"
#include "ipa-ref.h"
! #include "plugin-api.h"
! #include "gcov-io.h"
#include "cgraph.h"
#include "tree-chkp.h"
#include "rtl-chkp.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/cgraph.c
gcc-trunk-streamer/gcc/cgraph.c
*** gcc-trunk/gcc/cgraph.c 2014-11-05 14:33:13.759782986 -0700
--- gcc-trunk-streamer/gcc/cgraph.c 2014-11-11 13:21:51.530328659 -0700
***************
*** 70,76 ****
--- 70,78 ----
#include "diagnostic-core.h"
#include "rtl.h"
#include "ipa-utils.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
#include "alloc-pool.h"
#include "ipa-prop.h"
#include "ipa-inline.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/config/darwin.c
gcc-trunk-streamer/gcc/config/darwin.c
*** gcc-trunk/gcc/config/darwin.c 2014-11-05 01:50:40.373568652 -0700
--- gcc-trunk-streamer/gcc/config/darwin.c 2014-11-12 15:08:59.662821279
-0700
***************
*** 74,79 ****
--- 74,80 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/config/i386/winnt.c
gcc-trunk-streamer/gcc/config/i386/winnt.c
*** gcc-trunk/gcc/config/i386/winnt.c 2014-11-05 01:50:40.497568658 -0700
--- gcc-trunk-streamer/gcc/config/i386/winnt.c 2014-11-15 23:16:21.567942746
-0700
***************
*** 64,69 ****
--- 64,70 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "builtins.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/data-streamer.c
gcc-trunk-streamer/gcc/data-streamer.c
*** gcc-trunk/gcc/data-streamer.c 2014-11-05 01:50:41.081568686 -0700
--- gcc-trunk-streamer/gcc/data-streamer.c 2014-11-10 20:33:40.063401042
-0700
***************
*** 42,47 ****
--- 42,49 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "data-streamer.h"
/* Pack WORK into BP in a variant of uleb format. */
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/data-streamer-in.c
gcc-trunk-streamer/gcc/data-streamer-in.c
*** gcc-trunk/gcc/data-streamer-in.c 2014-11-05 01:50:41.081568686 -0700
--- gcc-trunk-streamer/gcc/data-streamer-in.c 2014-11-10 20:33:40.063401042
-0700
***************
*** 44,49 ****
--- 44,50 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "data-streamer.h"
/* Read a string from the string table in DATA_IN using input block
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/data-streamer-out.c
gcc-trunk-streamer/gcc/data-streamer-out.c
*** gcc-trunk/gcc/data-streamer-out.c 2014-11-05 01:50:41.081568686 -0700
--- gcc-trunk-streamer/gcc/data-streamer-out.c 2014-11-10 20:33:40.063401042
-0700
***************
*** 43,48 ****
--- 43,50 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "data-streamer.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/gimple-streamer-in.c
gcc-trunk-streamer/gcc/gimple-streamer-in.c
*** gcc-trunk/gcc/gimple-streamer-in.c 2014-11-05 01:50:41.209568692 -0700
--- gcc-trunk-streamer/gcc/gimple-streamer-in.c 2014-11-11 15:03:18.570623254
-0700
***************
*** 51,59 ****
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "data-streamer.h"
#include "tree-streamer.h"
! #include "gimple-streamer.h"
#include "value-prof.h"
/* Read a PHI function for basic block BB in function FN. DATA_IN is
--- 51,63 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "data-streamer.h"
+ #include "streamer-hooks.h"
#include "tree-streamer.h"
! #include "tree-streamer-in.h"
! #include "lto-streamer-in.h"
! #include "gimple-streamer-in.h"
#include "value-prof.h"
/* Read a PHI function for basic block BB in function FN. DATA_IN is
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/gimple-streamer-out.c
gcc-trunk-streamer/gcc/gimple-streamer-out.c
*** gcc-trunk/gcc/gimple-streamer-out.c 2014-11-05 01:50:41.209568692 -0700
--- gcc-trunk-streamer/gcc/gimple-streamer-out.c 2014-11-10
20:43:34.487429811 -0700
***************
*** 45,53 ****
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "data-streamer.h"
! #include "gimple-streamer.h"
#include "lto-streamer.h"
#include "tree-streamer.h"
#include "value-prof.h"
--- 45,56 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "data-streamer.h"
! #include "gimple-streamer-out.h"
#include "lto-streamer.h"
+ #include "streamer-hooks.h"
#include "tree-streamer.h"
#include "value-prof.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-chkp.c
gcc-trunk-streamer/gcc/ipa-chkp.c
*** gcc-trunk/gcc/ipa-chkp.c 2014-11-05 14:33:13.839782990 -0700
--- gcc-trunk-streamer/gcc/ipa-chkp.c 2014-11-10 23:09:37.091853896 -0700
***************
*** 37,43 ****
#include "basic-block.h"
#include "gimple.h"
#include "ipa-ref.h"
! #include "lto-streamer.h"
#include "cgraph.h"
#include "tree-chkp.h"
#include "ipa-chkp.h"
--- 37,46 ----
#include "basic-block.h"
#include "gimple.h"
#include "ipa-ref.h"
! #include "plugin-api.h"
! #include "gcov-io.h"
! #include "hash-map.h"
! #include "diagnostic.h"
#include "cgraph.h"
#include "tree-chkp.h"
#include "ipa-chkp.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-icf.c
gcc-trunk-streamer/gcc/ipa-icf.c
*** gcc-trunk/gcc/ipa-icf.c 2014-11-05 14:33:13.839782990 -0700
--- gcc-trunk-streamer/gcc/ipa-icf.c 2014-11-11 14:37:50.110549281 -0700
***************
*** 95,101 ****
--- 95,104 ----
#include "coverage.h"
#include "attribs.h"
#include "print-tree.h"
+ #include "diagnostic.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
+ #include "lto-streamer-out.h"
#include "data-streamer.h"
#include "ipa-utils.h"
#include <list>
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-icf-gimple.c
gcc-trunk-streamer/gcc/ipa-icf-gimple.c
*** gcc-trunk/gcc/ipa-icf-gimple.c 2014-11-10 20:22:14.248208050 -0700
--- gcc-trunk-streamer/gcc/ipa-icf-gimple.c 2014-11-10 20:33:40.063401042
-0700
***************
*** 52,57 ****
--- 52,59 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "data-streamer.h"
#include "ipa-utils.h"
#include <list>
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-inline-analysis.c
gcc-trunk-streamer/gcc/ipa-inline-analysis.c
*** gcc-trunk/gcc/ipa-inline-analysis.c 2014-11-05 01:50:41.241568694 -0700
--- gcc-trunk-streamer/gcc/ipa-inline-analysis.c 2014-11-11
14:30:58.046529338 -0700
***************
*** 112,118 ****
--- 112,121 ----
#include "alloc-pool.h"
#include "ipa-prop.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
+ #include "lto-streamer-out.h"
#include "data-streamer.h"
+ #include "streamer-hooks.h"
#include "tree-streamer.h"
#include "ipa-inline.h"
#include "cfgloop.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-polymorphic-call.c
gcc-trunk-streamer/gcc/ipa-polymorphic-call.c
*** gcc-trunk/gcc/ipa-polymorphic-call.c 2014-11-05 01:50:41.245568694
-0700
--- gcc-trunk-streamer/gcc/ipa-polymorphic-call.c 2014-11-10
20:33:40.067401042 -0700
***************
*** 61,66 ****
--- 61,67 ----
#include "gimple-pretty-print.h"
#include "stor-layout.h"
#include "intl.h"
+ #include "gcov-io.h"
#include "data-streamer.h"
#include "lto-streamer.h"
#include "streamer-hooks.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-profile.c
gcc-trunk-streamer/gcc/ipa-profile.c
*** gcc-trunk/gcc/ipa-profile.c 2014-11-05 01:50:41.245568694 -0700
--- gcc-trunk-streamer/gcc/ipa-profile.c 2014-11-10 20:33:40.067401042
-0700
***************
*** 80,85 ****
--- 80,87 ----
#include "value-prof.h"
#include "alloc-pool.h"
#include "tree-inline.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "ipa-prop.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-prop.c
gcc-trunk-streamer/gcc/ipa-prop.c
*** gcc-trunk/gcc/ipa-prop.c 2014-11-05 01:50:41.245568694 -0700
--- gcc-trunk-streamer/gcc/ipa-prop.c 2014-11-11 14:37:01.058546907 -0700
***************
*** 68,75 ****
--- 68,80 ----
#include "flags.h"
#include "diagnostic.h"
#include "gimple-pretty-print.h"
+ #include "gcov-io.h"
+ #include "plugin-api.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
+ #include "lto-streamer-out.h"
#include "data-streamer.h"
+ #include "streamer-hooks.h"
#include "tree-streamer.h"
#include "params.h"
#include "ipa-utils.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-pure-const.c
gcc-trunk-streamer/gcc/ipa-pure-const.c
*** gcc-trunk/gcc/ipa-pure-const.c 2014-11-05 14:33:13.839782990 -0700
--- gcc-trunk-streamer/gcc/ipa-pure-const.c 2014-11-10 20:33:40.071401043
-0700
***************
*** 73,78 ****
--- 73,79 ----
#include "gimple-pretty-print.h"
#include "langhooks.h"
#include "target.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "data-streamer.h"
#include "tree-streamer.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-reference.c
gcc-trunk-streamer/gcc/ipa-reference.c
*** gcc-trunk/gcc/ipa-reference.c 2014-11-05 01:50:41.245568694 -0700
--- gcc-trunk-streamer/gcc/ipa-reference.c 2014-11-10 20:33:40.071401043
-0700
***************
*** 68,73 ****
--- 68,74 ----
#include "ipa-reference.h"
#include "flags.h"
#include "diagnostic.h"
+ #include "gcov-io.h"
#include "data-streamer.h"
#include "lto-streamer.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/ipa-utils.c
gcc-trunk-streamer/gcc/ipa-utils.c
*** gcc-trunk/gcc/ipa-utils.c 2014-11-05 01:50:41.249568694 -0700
--- gcc-trunk-streamer/gcc/ipa-utils.c 2014-11-10 20:33:40.071401043 -0700
***************
*** 53,58 ****
--- 53,59 ----
#include "flags.h"
#include "diagnostic.h"
#include "langhooks.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "alloc-pool.h"
#include "ipa-prop.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto/lto.c
gcc-trunk-streamer/gcc/lto/lto.c
*** gcc-trunk/gcc/lto/lto.c 2014-11-05 01:50:41.377568700 -0700
--- gcc-trunk-streamer/gcc/lto/lto.c 2014-11-11 14:43:42.022566313 -0700
***************
*** 56,62 ****
--- 56,65 ----
#include "gimple.h"
#include "lto.h"
#include "lto-tree.h"
+ #include "gcov-io.h"
+ #include "target.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
#include "lto-section-names.h"
#include "tree-streamer.h"
#include "splay-tree.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto/lto-lang.c
gcc-trunk-streamer/gcc/lto/lto-lang.c
*** gcc-trunk/gcc/lto/lto-lang.c 2014-11-05 01:50:41.365568700 -0700
--- gcc-trunk-streamer/gcc/lto/lto-lang.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 53,58 ****
--- 53,59 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "cilk.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto/lto-object.c
gcc-trunk-streamer/gcc/lto/lto-object.c
*** gcc-trunk/gcc/lto/lto-object.c 2014-11-05 01:50:41.365568700 -0700
--- gcc-trunk-streamer/gcc/lto/lto-object.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 43,48 ****
--- 43,49 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "simple-object.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto/lto-partition.c
gcc-trunk-streamer/gcc/lto/lto-partition.c
*** gcc-trunk/gcc/lto/lto-partition.c 2014-11-05 14:33:13.843782991 -0700
--- gcc-trunk-streamer/gcc/lto/lto-partition.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 41,46 ****
--- 41,48 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "lto-streamer.h"
#include "timevar.h"
#include "params.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto/lto-symtab.c
gcc-trunk-streamer/gcc/lto/lto-symtab.c
*** gcc-trunk/gcc/lto/lto-symtab.c 2014-11-05 01:50:41.369568700 -0700
--- gcc-trunk-streamer/gcc/lto/lto-symtab.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 42,47 ****
--- 42,49 ----
#include "hash-map.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "target.h"
#include "lto-streamer.h"
#include "ipa-utils.h"
#include "alloc-pool.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-cgraph.c
gcc-trunk-streamer/gcc/lto-cgraph.c
*** gcc-trunk/gcc/lto-cgraph.c 2014-11-05 14:33:13.843782991 -0700
--- gcc-trunk-streamer/gcc/lto-cgraph.c 2014-11-11 14:38:23.926550918 -0700
***************
*** 52,59 ****
--- 52,63 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
+ #include "lto-streamer-out.h"
#include "data-streamer.h"
+ #include "streamer-hooks.h"
#include "tree-streamer.h"
#include "gcov-io.h"
#include "tree-pass.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-compress.c
gcc-trunk-streamer/gcc/lto-compress.c
*** gcc-trunk/gcc/lto-compress.c 2014-11-05 01:50:41.361568699 -0700
--- gcc-trunk-streamer/gcc/lto-compress.c 2014-11-10 20:33:40.071401043
-0700
***************
*** 49,54 ****
--- 49,55 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-opts.c
gcc-trunk-streamer/gcc/lto-opts.c
*** gcc-trunk/gcc/lto-opts.c 2014-11-05 01:50:41.361568699 -0700
--- gcc-trunk-streamer/gcc/lto-opts.c 2014-11-10 20:33:40.071401043 -0700
***************
*** 48,53 ****
--- 48,54 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "toplev.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-section-in.c
gcc-trunk-streamer/gcc/lto-section-in.c
*** gcc-trunk/gcc/lto-section-in.c 2014-11-05 01:50:41.361568699 -0700
--- gcc-trunk-streamer/gcc/lto-section-in.c 2014-11-10 20:33:40.071401043
-0700
***************
*** 48,53 ****
--- 48,54 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-section-out.c
gcc-trunk-streamer/gcc/lto-section-out.c
*** gcc-trunk/gcc/lto-section-out.c 2014-11-05 01:50:41.361568699 -0700
--- gcc-trunk-streamer/gcc/lto-section-out.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 46,51 ****
--- 46,53 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
#include "data-streamer.h"
#include "lto-streamer.h"
#include "lto-compress.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-streamer.c
gcc-trunk-streamer/gcc/lto-streamer.c
*** gcc-trunk/gcc/lto-streamer.c 2014-11-05 01:50:41.365568700 -0700
--- gcc-trunk-streamer/gcc/lto-streamer.c 2014-11-11 14:38:51.018552229
-0700
***************
*** 47,54 ****
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
! #include "tree-streamer.h"
#include "lto-streamer.h"
#include "lto-section-names.h"
#include "streamer-hooks.h"
--- 47,57 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
! #include "gcov-io.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
+ #include "lto-streamer-out.h"
+ #include "tree-streamer.h"
#include "lto-section-names.h"
#include "streamer-hooks.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-streamer-in.c
gcc-trunk-streamer/gcc/lto-streamer-in.c
*** gcc-trunk/gcc/lto-streamer-in.c 2014-11-05 01:50:41.365568700 -0700
--- gcc-trunk-streamer/gcc/lto-streamer-in.c 2014-11-18 23:47:50.169413256
-0700
***************
*** 62,75 ****
#include "ipa-ref.h"
#include "cgraph.h"
#include "ipa-utils.h"
#include "data-streamer.h"
! #include "gimple-streamer.h"
#include "lto-streamer.h"
#include "tree-streamer.h"
#include "tree-pass.h"
#include "streamer-hooks.h"
#include "cfgloop.h"
struct freeing_string_slot_hasher : string_slot_hasher
{
--- 62,82 ----
#include "ipa-ref.h"
#include "cgraph.h"
#include "ipa-utils.h"
+ #include "gcov-io.h"
+ #include "target.h"
#include "data-streamer.h"
! #include "gimple-streamer-in.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
#include "tree-streamer.h"
+ #include "tree-streamer-in.h"
#include "tree-pass.h"
#include "streamer-hooks.h"
#include "cfgloop.h"
+ static tree lto_input_tree_ref (struct lto_input_block *, struct data_in *,
+ struct function *, enum LTO_tags);
+
struct freeing_string_slot_hasher : string_slot_hasher
{
***************
*** 107,126 ****
internal_error ("bytecode stream: unexpected tag %s", lto_tag_name
(actual));
}
-
- /* Read LENGTH bytes from STREAM to ADDR. */
-
- void
- lto_input_data_block (struct lto_input_block *ib, void *addr, size_t length)
- {
- size_t i;
- unsigned char *const buffer = (unsigned char *const) addr;
-
- for (i = 0; i < length; i++)
- buffer[i] = streamer_read_uchar (ib);
- }
-
-
/* Lookup STRING in file_name_hash_table. If found, return the existing
string, otherwise insert STRING as the canonical version. */
--- 114,119 ----
***************
*** 204,210 ****
representation of the tree using stream_read_tree. FN is the
function scope for the read tree. */
! tree
lto_input_tree_ref (struct lto_input_block *ib, struct data_in *data_in,
struct function *fn, enum LTO_tags tag)
{
--- 197,203 ----
representation of the tree using stream_read_tree. FN is the
function scope for the read tree. */
! static tree
lto_input_tree_ref (struct lto_input_block *ib, struct data_in *data_in,
struct function *fn, enum LTO_tags tag)
{
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/lto-streamer-out.c
gcc-trunk-streamer/gcc/lto-streamer-out.c
*** gcc-trunk/gcc/lto-streamer-out.c 2014-11-05 01:50:41.365568700 -0700
--- gcc-trunk-streamer/gcc/lto-streamer-out.c 2014-11-18 23:55:04.617434282
-0700
***************
*** 58,73 ****
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.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"
static void lto_write_tree (struct output_block*, tree, bool);
/* Clear the line info stored in DATA_IN. */
--- 58,81 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "target.h"
#include "lto-streamer.h"
+ #include "lto-streamer-out.h"
#include "data-streamer.h"
! #include "gimple-streamer-out.h"
#include "tree-streamer.h"
+ #include "tree-streamer-out.h"
#include "streamer-hooks.h"
#include "cfgloop.h"
#include "builtins.h"
static void lto_write_tree (struct output_block*, tree, bool);
+ static void lto_output_decl_state_streams (struct output_block *,
+ struct lto_out_decl_state *);
+ static void lto_output_decl_state_refs (struct output_block *ob,
+ struct lto_out_decl_state *state);
/* Clear the line info stored in DATA_IN. */
***************
*** 2373,2379 ****
/* Write all the streams in an lto_out_decl_state STATE using
output block OB and output stream OUT_STREAM. */
! void
lto_output_decl_state_streams (struct output_block *ob,
struct lto_out_decl_state *state)
{
--- 2381,2387 ----
/* Write all the streams in an lto_out_decl_state STATE using
output block OB and output stream OUT_STREAM. */
! static void
lto_output_decl_state_streams (struct output_block *ob,
struct lto_out_decl_state *state)
{
***************
*** 2387,2393 ****
/* Write all the references in an lto_out_decl_state STATE using
output block OB and output stream OUT_STREAM. */
! void
lto_output_decl_state_refs (struct output_block *ob,
struct lto_out_decl_state *state)
{
--- 2395,2401 ----
/* Write all the references in an lto_out_decl_state STATE using
output block OB and output stream OUT_STREAM. */
! static void
lto_output_decl_state_refs (struct output_block *ob,
struct lto_out_decl_state *state)
{
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/opts-global.c
gcc-trunk-streamer/gcc/opts-global.c
*** gcc-trunk/gcc/opts-global.c 2014-11-05 01:50:41.397568701 -0700
--- gcc-trunk-streamer/gcc/opts-global.c 2014-11-10 20:33:40.075401043
-0700
***************
*** 48,53 ****
--- 48,54 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
#include "output.h"
#include "plugin.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/passes.c
gcc-trunk-streamer/gcc/passes.c
*** gcc-trunk/gcc/passes.c 2014-11-05 14:33:13.847782991 -0700
--- gcc-trunk-streamer/gcc/passes.c 2014-11-11 14:40:39.614557485 -0700
***************
*** 85,90 ****
--- 85,91 ----
#include "ipa-ref.h"
#include "cgraph.h"
#include "lto-streamer.h"
+ #include "lto-streamer-out.h"
#include "plugin.h"
#include "ipa-utils.h"
#include "tree-pretty-print.h" /* for dump_function_header */
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/symtab.c
gcc-trunk-streamer/gcc/symtab.c
*** gcc-trunk/gcc/symtab.c 2014-11-05 14:33:13.851782991 -0700
--- gcc-trunk-streamer/gcc/symtab.c 2014-11-10 20:33:40.075401043 -0700
***************
*** 49,54 ****
--- 49,56 ----
#include "cgraph.h"
#include "diagnostic.h"
#include "timevar.h"
+ #include "gcov-io.h"
+ #include "target.h"
#include "lto-streamer.h"
#include "output.h"
#include "ipa-utils.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/tree-chkp.c
gcc-trunk-streamer/gcc/tree-chkp.c
*** gcc-trunk/gcc/tree-chkp.c 2014-11-05 14:33:13.891782993 -0700
--- gcc-trunk-streamer/gcc/tree-chkp.c 2014-11-10 23:13:04.987863958 -0700
***************
*** 63,69 ****
#include "rtl.h" /* For MEM_P, assign_temp. */
#include "tree-dfa.h"
#include "ipa-ref.h"
! #include "lto-streamer.h"
#include "cgraph.h"
#include "ipa-chkp.h"
#include "params.h"
--- 63,70 ----
#include "rtl.h" /* For MEM_P, assign_temp. */
#include "tree-dfa.h"
#include "ipa-ref.h"
! #include "plugin-api.h"
! #include "gcov-io.h"
#include "cgraph.h"
#include "ipa-chkp.h"
#include "params.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/tree-streamer.c
gcc-trunk-streamer/gcc/tree-streamer.c
*** gcc-trunk/gcc/tree-streamer.c 2014-11-05 01:50:46.541568950 -0700
--- gcc-trunk-streamer/gcc/tree-streamer.c 2014-11-10 20:33:40.079401043
-0700
***************
*** 44,49 ****
--- 44,52 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "diagnostic.h"
+ #include "lto-streamer.h"
#include "tree-streamer.h"
/* Check that all the TS_* structures handled by the streamer_write_* and
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/tree-streamer-in.c
gcc-trunk-streamer/gcc/tree-streamer-in.c
*** gcc-trunk/gcc/tree-streamer-in.c 2014-11-05 01:50:46.541568950 -0700
--- gcc-trunk-streamer/gcc/tree-streamer-in.c 2014-11-11 14:41:57.590561258
-0700
***************
*** 44,53 ****
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
- #include "lto-streamer.h"
#include "builtins.h"
/* Read a STRING_CST from the string table in DATA_IN using input
--- 44,56 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "target.h"
+ #include "lto-streamer.h"
+ #include "lto-streamer-in.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
#include "builtins.h"
/* Read a STRING_CST from the string table in DATA_IN using input
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/tree-streamer-out.c
gcc-trunk-streamer/gcc/tree-streamer-out.c
*** gcc-trunk/gcc/tree-streamer-out.c 2014-11-05 01:50:46.541568950 -0700
--- gcc-trunk-streamer/gcc/tree-streamer-out.c 2014-11-10 20:33:40.079401043
-0700
***************
*** 44,49 ****
--- 44,52 ----
#include "plugin-api.h"
#include "ipa-ref.h"
#include "cgraph.h"
+ #include "gcov-io.h"
+ #include "target.h"
+ #include "lto-streamer.h"
#include "tree-streamer.h"
#include "data-streamer.h"
#include "streamer-hooks.h"
diff -cr --new-file '--exclude=.git' gcc-trunk/gcc/varpool.c
gcc-trunk-streamer/gcc/varpool.c
*** gcc-trunk/gcc/varpool.c 2014-11-10 20:22:14.340208055 -0700
--- gcc-trunk-streamer/gcc/varpool.c 2014-11-11 14:42:36.734563153 -0700
***************
*** 48,54 ****
--- 48,56 ----
#include "flags.h"
#include "tree-ssa-alias.h"
#include "gimple.h"
+ #include "gcov-io.h"
#include "lto-streamer.h"
+ #include "lto-streamer-in.h"
const char * const tls_model_names[]={"none", "tls-emulated", "tls-real",
"tls-global-dynamic", "tls-local-dynamic",
