Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-sccvn.c

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 1f03600..c2bd59d 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -628,6 +628,10 @@ copy_reference_ops_from_ref (tree ref, VEC(vn_reference_op_s, heap) **result)
 
       switch (temp.opcode)
        {
+       case WITH_SIZE_EXPR:
+         temp.op0 = TREE_OPERAND (ref, 1);
+         temp.off = 0;
+         break;
        case MEM_REF:
          /* The base address gets its own vn_reference_op_s structure.  */
          temp.op0 = TREE_OPERAND (ref, 1);
@@ -744,6 +748,7 @@ copy_reference_ops_from_ref (tree ref, VEC(vn_reference_op_s, heap) **result)
       VEC_safe_push (vn_reference_op_s, heap, *result, &temp);
 
       if (REFERENCE_CLASS_P (ref)
+         || TREE_CODE (ref) == WITH_SIZE_EXPR
          || (TREE_CODE (ref) == ADDR_EXPR
              && !is_gimple_min_invariant (ref)))
        ref = TREE_OPERAND (ref, 0);
@@ -1343,18 +1348,19 @@ vn_reference_lookup_2 (ao_ref *op ATTRIBUTE_UNUSED, tree vuse, void *vr_)
 
 /* Lookup an existing or insert a new vn_reference entry into the
    value table for the VUSE, SET, TYPE, OPERANDS reference which
-   has the constant value CST.  */
+   has the value VALUE which is either a constant or an SSA name.  */
 
 static vn_reference_t
-vn_reference_lookup_or_insert_constant_for_pieces (tree vuse,
-                                                  alias_set_type set,
-                                                  tree type,
-                                                  VEC (vn_reference_op_s,
-                                                       heap) *operands,
-                                                  tree cst)
+vn_reference_lookup_or_insert_for_pieces (tree vuse,
+                                         alias_set_type set,
+                                         tree type,
+                                         VEC (vn_reference_op_s,
+                                              heap) *operands,
+                                         tree value)
 {
   struct vn_reference_s vr1;
   vn_reference_t result;
+  unsigned value_id;
   vr1.vuse = vuse;
   vr1.operands = operands;
   vr1.type = type;
@@ -1362,10 +1368,13 @@ vn_reference_lookup_or_insert_constant_for_pieces (tree vuse,
   vr1.hashcode = vn_reference_compute_hash (&vr1);
   if (vn_reference_lookup_1 (&vr1, &result))
     return result;
+  if (TREE_CODE (value) == SSA_NAME)
+    value_id = VN_INFO (value)->value_id;
+  else
+    value_id = get_or_alloc_constant_value_id (value);
   return vn_reference_insert_pieces (vuse, set, type,
                                     VEC_copy (vn_reference_op_s, heap,
-                                              operands), cst,
-                                    get_or_alloc_constant_value_id (cst));
+                                              operands), value, value_id);
 }
 
 /* Callback for walk_non_aliased_vuses.  Tries to perform a lookup
@@ -1447,7 +1456,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_)
          && offset2 + size2 >= offset + maxsize)
        {
          tree val = build_zero_cst (vr->type);
-         return vn_reference_lookup_or_insert_constant_for_pieces
+         return vn_reference_lookup_or_insert_for_pieces
                   (vuse, vr->set, vr->type, vr->operands, val);
        }
     }
@@ -1468,14 +1477,15 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_)
          && offset2 + size2 >= offset + maxsize)
        {
          tree val = build_zero_cst (vr->type);
-         return vn_reference_lookup_or_insert_constant_for_pieces
+         return vn_reference_lookup_or_insert_for_pieces
                   (vuse, vr->set, vr->type, vr->operands, val);
        }
     }
 
   /* 3) Assignment from a constant.  We can use folds native encode/interpret
      routines to extract the assigned bits.  */
-  else if (CHAR_BIT == 8 && BITS_PER_UNIT == 8
+  else if (vn_walk_kind == VN_WALKREWRITE
+          && CHAR_BIT == 8 && BITS_PER_UNIT == 8
           && ref->size == maxsize
           && maxsize % BITS_PER_UNIT == 0
           && offset % BITS_PER_UNIT == 0
@@ -1509,7 +1519,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_)
                                                   / BITS_PER_UNIT),
                                                ref->size / BITS_PER_UNIT);
              if (val)
-               return vn_reference_lookup_or_insert_constant_for_pieces
+               return vn_reference_lookup_or_insert_for_pieces
                         (vuse, vr->set, vr->type, vr->operands, val);
            }
        }
@@ -1563,7 +1573,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_)
                    }
                }
              if (val)
-               return vn_reference_lookup_or_insert_constant_for_pieces
+               return vn_reference_lookup_or_insert_for_pieces
                         (vuse, vr->set, vr->type, vr->operands, val);
            }
        }
@@ -2457,11 +2467,11 @@ print_scc (FILE *out, VEC (tree, heap) *scc)
   tree var;
   unsigned int i;
 
-  fprintf (out, "SCC consists of: ");
+  fprintf (out, "SCC consists of:");
   FOR_EACH_VEC_ELT (tree, scc, i, var)
     {
-      print_generic_expr (out, var, 0);
       fprintf (out, " ");
+      print_generic_expr (out, var, 0);
     }
   fprintf (out, "\n");
 }
@@ -3581,6 +3591,8 @@ extract_and_process_scc_for_name (tree name)
        fprintf (dump_file, "WARNING: Giving up with SCCVN due to "
                 "SCC size %u exceeding %u\n", VEC_length (tree, scc),
                 (unsigned)PARAM_VALUE (PARAM_SCCVN_MAX_SCC_SIZE));
+
+      VEC_free (tree, heap, scc);
       return false;
     }