Steve Ellcey <sell...@mips.com> wrote:
>While looking at PR 59335 (plugin doesn't build) I saw the comments
>about
>tree-flow.h and tree-flow-inline.h not existing anymore. While these
>files have been removed there are still some references to them in
>Makefile.in, doc/tree-ssa.texi, and a couple of source files. This
>patch
>removes the references to these now-nonexistent files.
>
>OK to checkin?
Ok.
Thanks,
Richard.
>Steve Ellcey
>sell...@mips.com
>
>
>2014-01-09 Steve Ellcey <sell...@mips.com>
>
> * Makefile.in (TREE_FLOW_H): Remove.
> (TREE_SSA_H): Add files names from tree-flow.h.
> * doc/tree-ssa.texi (Annotations): Remove reference to tree-flow.h
> * tree.h: Remove tree-flow.h reference.
> * hash-table.h: Remove tree-flow.h reference.
> * tree-ssa-loop-niter.c (dump_affine_iv): Replace tree-flow.h
> reference with tree-ssa-loop.h.
>
>
>diff --git a/gcc/Makefile.in b/gcc/Makefile.in
>index 459b1ba..8eb4f68 100644
>--- a/gcc/Makefile.in
>+++ b/gcc/Makefile.in
>@@ -929,11 +929,10 @@ CPP_ID_DATA_H = $(CPPLIB_H)
>$(srcdir)/../libcpp/include/cpp-id-data.h
> CPP_INTERNAL_H = $(srcdir)/../libcpp/internal.h $(CPP_ID_DATA_H)
> TREE_DUMP_H = tree-dump.h $(SPLAY_TREE_H) $(DUMPFILE_H)
> TREE_PASS_H = tree-pass.h $(TIMEVAR_H) $(DUMPFILE_H)
>-TREE_FLOW_H = tree-flow.h tree-flow-inline.h tree-ssa-operands.h \
>+TREE_SSA_H = tree-ssa.h tree-ssa-operands.h \
> $(BITMAP_H) sbitmap.h $(BASIC_BLOCK_H) $(GIMPLE_H) \
> $(HASHTAB_H) $(CGRAPH_H) $(IPA_REFERENCE_H) \
> tree-ssa-alias.h
>-TREE_SSA_H = tree-ssa.h $(TREE_FLOW_H)
> PRETTY_PRINT_H = pretty-print.h $(INPUT_H) $(OBSTACK_H)
> TREE_PRETTY_PRINT_H = tree-pretty-print.h $(PRETTY_PRINT_H)
> GIMPLE_PRETTY_PRINT_H = gimple-pretty-print.h $(TREE_PRETTY_PRINT_H)
>diff --git a/gcc/doc/tree-ssa.texi b/gcc/doc/tree-ssa.texi
>index 391dba8..e0238bd 100644
>--- a/gcc/doc/tree-ssa.texi
>+++ b/gcc/doc/tree-ssa.texi
>@@ -53,9 +53,6 @@ variable has aliases. All these attributes are
>stored in data
> structures called annotations which are then linked to the field
> @code{ann} in @code{struct tree_common}.
>
>-Presently, we define annotations for variables (@code{var_ann_t}).
>-Annotations are defined and documented in @file{tree-flow.h}.
>-
>
> @node SSA Operands
> @section SSA Operands
>diff --git a/gcc/hash-table.h b/gcc/hash-table.h
>index 2b04067..034385c 100644
>--- a/gcc/hash-table.h
>+++ b/gcc/hash-table.h
>@@ -1050,10 +1050,7 @@ hash_table <Descriptor, Allocator>::end ()
>
> /* Iterate through the elements of hash_table HTAB,
> using hash_table <....>::iterator ITER,
>- storing each element in RESULT, which is of type TYPE.
>-
>- This macro has this form for compatibility with the
>- FOR_EACH_HTAB_ELEMENT currently defined in tree-flow.h. */
>+ storing each element in RESULT, which is of type TYPE. */
>
> #define FOR_EACH_HASH_TABLE_ELEMENT(HTAB, RESULT, TYPE, ITER) \
> for ((ITER) = (HTAB).begin (); \
>diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c
>index 5a10297..7628363 100644
>--- a/gcc/tree-ssa-loop-niter.c
>+++ b/gcc/tree-ssa-loop-niter.c
>@@ -1311,7 +1311,7 @@ dump_affine_iv (FILE *file, affine_iv *iv)
>if EVERY_ITERATION is true, we know the test is executed on every
>iteration.
>
> The results (number of iterations and assumptions as described in
>- comments at struct tree_niter_desc in tree-flow.h) are stored to
>NITER.
>+ comments at struct tree_niter_desc in tree-ssa-loop.h) are stored
>to NITER.
>Returns false if it fails to determine number of iterations, true if it
> was determined (possibly with some assumptions). */
>
>diff --git a/gcc/tree.h b/gcc/tree.h
>index fa79b6f..67454b7 100644
>--- a/gcc/tree.h
>+++ b/gcc/tree.h
>@@ -1114,9 +1114,6 @@ extern void protected_set_expr_location (tree,
>location_t);
> the given label expression. */
>#define LABEL_EXPR_LABEL(NODE) TREE_OPERAND (LABEL_EXPR_CHECK (NODE),
>0)
>
>-/* VDEF_EXPR accessors are specified in tree-flow.h, along with the
>other
>- accessors for SSA operands. */
>-
> /* CATCH_EXPR accessors. */
> #define CATCH_TYPES(NODE) TREE_OPERAND (CATCH_EXPR_CHECK (NODE), 0)
> #define CATCH_BODY(NODE) TREE_OPERAND (CATCH_EXPR_CHECK (NODE), 1)
