Makefile.in (TREE_FLOW_H): Remove.

2014-01-09  Steve Ellcey  <sellcey@mips.com>

	* Makefile.in (TREE_FLOW_H): Remove.
	(TREE_SSA_H): Add file 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.

From-SVN: r206496

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87f1e29e3e08cfb282c961d1733ee89e6e79e5a6..3d66bcb187cd86cff7a29fdd38523c319baf1cda 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-09  Steve Ellcey  <sellcey@mips.com>
+
+       * Makefile.in (TREE_FLOW_H): Remove.
+       (TREE_SSA_H): Add file 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.
+
 2014-01-09  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        * doc/invoke.texi: Add -maltivec={be,le} options, and document

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 459b1baf22be038cfe3529ba7667ae3dbc38e09e..8eb4f681e5dd08cc68a9f35f373f07eb48a2e4fd 100644 (file)
--- 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 391dba89e5d2ca58ef2a97327f0ef563461a6ef3..e0238bd218a9a3c872482eca29ea287e2af5212a 100644 (file)
--- 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 2b04067f74a668498e70fb85535b9f77e70a2178..034385c19f27adf6c427e1d51ea6674786b646dc 100644 (file)
--- 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 5a10297ba1000f13cab966b38fa1fe7711a4e737..7628363cc6247809421b017e67041369ae738fcf 100644 (file)
--- 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 8006b5ad29411cc5ada1f0c3105b3f3ec4333ebe..e22e53c152f2a1d963af6af4d1e3edcacb43b8be 100644 (file)
--- 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)