* cp-tree.h (note_decl_for_pch): New function.

[pf3gnuchains/gcc-fork.git] / gcc / tree-scalar-evolution.c

diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c
index 48da0d2..4b5dbc8 100644 (file)
--- a/gcc/tree-scalar-evolution.c
+++ b/gcc/tree-scalar-evolution.c
@@ -331,7 +331,7 @@ del_scev_info (void *e)
 
 /* Get the index corresponding to VAR in the current LOOP.  If
    it's the first time we ask for this VAR, then we return
-   chrec_not_analysed_yet for this VAR and return its index.  */
+   chrec_not_analyzed_yet for this VAR and return its index.  */
 
 static tree *
 find_var_scev_info (tree var)
@@ -506,9 +506,8 @@ compute_overall_effect_of_inner_loop (struct loop *loop, tree evolution_fn)
              /* Number of iterations is off by one (the ssa name we
                 analyze must be defined before the exit).  */
              nb_iter = chrec_fold_minus (chrec_type (nb_iter),
-                                         nb_iter,
-                                         fold_convert (chrec_type (nb_iter),
-                                                       integer_one_node));
+                               nb_iter,
+                               build_int_cst_type (chrec_type (nb_iter), 1));
              
              /* evolution_fn is the evolution function in LOOP.  Get
                 its value in the nb_iter-th iteration.  */
@@ -896,7 +895,7 @@ add_to_evolution (unsigned loop_nb,
 
   if (code == MINUS_EXPR)
     to_add = chrec_fold_multiply (type, to_add, 
-                                 fold_convert (type, integer_minus_one_node));
+                                 build_int_cst_type (type, -1));
 
   res = add_to_evolution_1 (loop_nb, chrec_before, to_add);
 
@@ -916,7 +915,9 @@ static inline tree
 set_nb_iterations_in_loop (struct loop *loop, 
                           tree res)
 {
-  res = chrec_fold_plus (chrec_type (res), res, integer_one_node);
+  res = chrec_fold_plus (chrec_type (res), res,
+                        build_int_cst_type (chrec_type (res), 1));
+
   /* FIXME HWI: However we want to store one iteration less than the
      count of the loop in order to be compatible with the other
      nb_iter computations in loop-iv.  This also allows the
@@ -958,9 +959,6 @@ analyzable_condition (tree expr)
   switch (TREE_CODE (condition))
     {
     case SSA_NAME:
-      /* Volatile expressions are not analyzable.  */
-      if (TREE_THIS_VOLATILE (SSA_NAME_VAR (condition)))
-       return false;
       return true;
       
     case LT_EXPR:
@@ -969,22 +967,7 @@ analyzable_condition (tree expr)
     case GE_EXPR:
     case EQ_EXPR:
     case NE_EXPR:
-      {
-       tree opnd0, opnd1;
-       
-       opnd0 = TREE_OPERAND (condition, 0);
-       opnd1 = TREE_OPERAND (condition, 1);
-       
-       if (TREE_CODE (opnd0) == SSA_NAME
-           && TREE_THIS_VOLATILE (SSA_NAME_VAR (opnd0)))
-         return false;
-       
-       if (TREE_CODE (opnd1) == SSA_NAME
-           && TREE_THIS_VOLATILE (SSA_NAME_VAR (opnd1)))
-         return false;
-       
-       return true;
-      }
+      return true;
       
     default:
       return false;
@@ -1048,7 +1031,7 @@ get_exit_conditions_rec (struct loop *loop,
 }
 
 /* Select the candidate loop nests for the analysis.  This function
-   initializes the EXIT_CONDITIONS array.   */
+   initializes the EXIT_CONDITIONS array.  */
 
 static void
 select_loops_exit_conditions (struct loops *loops, 
@@ -1185,66 +1168,15 @@ follow_ssa_edge_in_rhs (struct loop *loop,
 
       if (TREE_CODE (rhs0) == SSA_NAME)
        {
-         if (TREE_CODE (rhs1) == SSA_NAME)
-           {
-             /* Match an assignment under the form: 
-                "a = b - c".  */
-             res = follow_ssa_edge 
-               (loop, SSA_NAME_DEF_STMT (rhs0), halting_phi, 
-                evolution_of_loop);
-             
-             if (res)
-               *evolution_of_loop = add_to_evolution 
-                 (loop->num, chrec_convert (type_rhs, *evolution_of_loop), 
-                  MINUS_EXPR, rhs1);
-             
-             else
-               {
-                 res = follow_ssa_edge 
-                   (loop, SSA_NAME_DEF_STMT (rhs1), halting_phi, 
-                    evolution_of_loop);
-                 
-                 if (res)
-                   *evolution_of_loop = add_to_evolution 
-                     (loop->num, 
-                      chrec_fold_multiply (type_rhs, 
-                                           *evolution_of_loop, 
-                                           fold_convert (type_rhs,
-                                                         integer_minus_one_node)),
-                      PLUS_EXPR, rhs0);
-               }
-           }
-         
-         else
-           {
-             /* Match an assignment under the form: 
-                "a = b - ...".  */
-             res = follow_ssa_edge 
-               (loop, SSA_NAME_DEF_STMT (rhs0), halting_phi, 
-                evolution_of_loop);
-             if (res)
-               *evolution_of_loop = add_to_evolution 
-                 (loop->num, chrec_convert (type_rhs, *evolution_of_loop), 
-                  MINUS_EXPR, rhs1);
-           }
-       }
-      
-      else if (TREE_CODE (rhs1) == SSA_NAME)
-       {
          /* Match an assignment under the form: 
-            "a = ... - c".  */
-         res = follow_ssa_edge 
-           (loop, SSA_NAME_DEF_STMT (rhs1), halting_phi, 
-            evolution_of_loop);
+            "a = b - ...".  */
+         res = follow_ssa_edge (loop, SSA_NAME_DEF_STMT (rhs0), halting_phi, 
+                                evolution_of_loop);
          if (res)
            *evolution_of_loop = add_to_evolution 
-             (loop->num, 
-              chrec_fold_multiply (type_rhs, 
-                                   *evolution_of_loop, 
-                                   fold_convert (type_rhs, integer_minus_one_node)),
-              PLUS_EXPR, rhs0);
+                   (loop->num, chrec_convert (type_rhs, *evolution_of_loop), 
+                    MINUS_EXPR, rhs1);
        }
-      
       else
        /* Otherwise, match an assignment under the form: 
           "a = ... - ...".  */
@@ -1398,6 +1330,11 @@ follow_ssa_edge_in_condition_phi (struct loop *loop,
 
   for (i = 1; i < PHI_NUM_ARGS (condition_phi); i++)
     {
+      /* Quickly give up when the evolution of one of the branches is
+        not known.  */
+      if (*evolution_of_loop == chrec_dont_know)
+       return true;
+
       if (!follow_ssa_edge_in_condition_phi_branch (i, loop, condition_phi,
                                                    halting_phi,
                                                    &evolution_of_branch,
@@ -2374,7 +2311,7 @@ analyze_scalar_evolution_for_all_loop_phi_nodes (varray_type exit_conditions)
       loop = loop_containing_stmt (VARRAY_TREE (exit_conditions, i));
       bb = loop->header;
       
-      for (phi = phi_nodes (bb); phi; phi = TREE_CHAIN (phi))
+      for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
        if (is_gimple_reg (PHI_RESULT (phi)))
          {
            chrec = instantiate_parameters