PR 5620

[pf3gnuchains/gcc-fork.git] / gcc / tree-chrec.c

diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c
index 9146ec3..957f55d 100644 (file)
--- a/gcc/tree-chrec.c
+++ b/gcc/tree-chrec.c
@@ -37,47 +37,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tree-pass.h"
 
 \f
-/* This part will be removed once the merging is finished.  */
-
-
-
-/* The following trees are unique elements.  Thus the comparison of
-   another element to these elements should be done on the pointer to
-   these trees, and not on their value.  */
-
-/* The SSA_NAMEs that are not yet analyzed are qualified with NULL_TREE.  */
-tree chrec_not_analyzed_yet;
-
-/* Reserved to the cases where the analyzer has detected an
-   undecidable property at compile time.  */
-tree chrec_dont_know;
-
-/* When the analyzer has detected that a property will never
-   happen, then it qualifies it with chrec_known.  */
-tree chrec_known;
-
-/* Empty hook.  Will be replaced by the main function from
-   tree-scalar-evolution.c.  */
-
-tree
-count_ev_in_wider_type (tree foo ATTRIBUTE_UNUSED, 
-                       tree bar ATTRIBUTE_UNUSED)
-{
-  return NULL_TREE;
-}
-
-/* Empty hook.  Will be replaced by the main function from
-   tree-scalar-evolution.c.  */
-
-bool 
-chrec_contains_symbols_defined_in_loop (tree chrec ATTRIBUTE_UNUSED, 
-                                       unsigned loop_nb ATTRIBUTE_UNUSED)
-{
-  return true;
-}
-
-
-\f
 
 /* Extended folder for chrecs.  */
 
@@ -259,7 +218,7 @@ chrec_fold_multiply_poly_poly (tree type,
      
      /* "2*b*d".  */
      chrec_fold_multiply
-     (type, build_int_2 (2, 0),
+     (type, build_int_cst (NULL_TREE, 2, 0),
       chrec_fold_multiply (type, CHREC_RIGHT (poly0), CHREC_RIGHT (poly1))));
 }
 
@@ -686,7 +645,7 @@ reset_evolution_in_loop (unsigned loop_num,
       && CHREC_VARIABLE (chrec) > loop_num)
     return build 
       (TREE_CODE (chrec), 
-       build_int_2 (CHREC_VARIABLE (chrec), 0), 
+       build_int_cst (NULL_TREE, CHREC_VARIABLE (chrec), 0), 
        reset_evolution_in_loop (loop_num, CHREC_LEFT (chrec), new_evol), 
        reset_evolution_in_loop (loop_num, CHREC_RIGHT (chrec), new_evol));