2007-01-07 Manuel Lopez-Ibanez <manu@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / gcc / tree-data-ref.c

diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 96d57a0..4d60da0 100644 (file)
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -149,7 +149,7 @@ ptr_decl_may_alias_p (tree ptr, tree decl,
   if (pi)
     tag = pi->name_mem_tag;
   if (!tag)
-    tag = get_var_ann (SSA_NAME_VAR (ptr))->symbol_mem_tag;
+    tag = symbol_mem_tag (SSA_NAME_VAR (ptr));
   if (!tag)
     tag = DR_MEMTAG (ptr_dr);
   if (!tag)
@@ -180,13 +180,13 @@ ptr_ptr_may_alias_p (tree ptr_a, tree ptr_b,
     }
   else
     {
-      tag_a = get_var_ann (SSA_NAME_VAR (ptr_a))->symbol_mem_tag;
+      tag_a = symbol_mem_tag (SSA_NAME_VAR (ptr_a));
       if (!tag_a)
        tag_a = DR_MEMTAG (dra);
       if (!tag_a)
        return false;
       
-      tag_b = get_var_ann (SSA_NAME_VAR (ptr_b))->symbol_mem_tag;
+      tag_b = symbol_mem_tag (SSA_NAME_VAR (ptr_b));
       if (!tag_b)
        tag_b = DR_MEMTAG (drb);
       if (!tag_b)
@@ -1729,10 +1729,9 @@ object_analysis (tree memref, tree stmt, bool is_read,
       switch (TREE_CODE (base_address))
        {
        case SSA_NAME:
-         *memtag = get_var_ann (SSA_NAME_VAR (base_address))->symbol_mem_tag;
+         *memtag = symbol_mem_tag (SSA_NAME_VAR (base_address));
          if (!(*memtag) && TREE_CODE (TREE_OPERAND (memref, 0)) == SSA_NAME)
-           *memtag = get_var_ann (
-                     SSA_NAME_VAR (TREE_OPERAND (memref, 0)))->symbol_mem_tag;
+           *memtag = symbol_mem_tag (SSA_NAME_VAR (TREE_OPERAND (memref, 0)));
          break;
        case ADDR_EXPR:
          *memtag = TREE_OPERAND (base_address, 0);
@@ -2305,7 +2304,7 @@ static tree
 get_number_of_iters_for_loop (int loopnum)
 {
   struct loop *loop = get_loop (loopnum);
-  tree numiter = number_of_iterations_in_loop (loop);
+  tree numiter = number_of_exit_cond_executions (loop);
 
   if (TREE_CODE (numiter) == INTEGER_CST)
     return numiter;