tree-ssa-dom.c (record_edge_info): Use last_basic_block to allocate info array.

	* tree-ssa-dom.c (record_edge_info): Use last_basic_block to
	allocate info array.
	* tree-vrp.c (extract_range_from_unary_expr): Set resulting
	range to varying in cast expressions that change
	TYPE_PRECISION.

testsuite/ChangeLog

	* gcc.dg/tree-ssa/vrp14.c: New test.

From-SVN: r100554

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16841422c6e2e891c0d7b7bcc652be9775992062..be74bb1b786ce71f34fc5eb1485adafaa20b96eb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-03  Diego Novillo  <dnovillo@redhat.com>
+
+       * tree-ssa-dom.c (record_edge_info): Use last_basic_block to
+       allocate info array.
+       * tree-vrp.c (extract_range_from_unary_expr): Set resulting
+       range to varying in cast expressions that change
+       TYPE_PRECISION.
+
 2005-06-03  Eric Christopher  <echristo@redhat.com>
 
        * config/mips/mips.opt: Add RejectNegative to divide-breaks and

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 523873461f4571f9989425dea28fe7424bfe2341..3142634db3b88b992271d605b399ab1d425e59bd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-03  Diego Novillo  <dnovillo@redhat.com>
+
+       * gcc.dg/tree-ssa/vrp14.c: New test.
+
 2005-06-03  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/21336

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp14.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp14.c
new file mode 100644 (file)
index 0000000..833a73d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp14.c
@@ -0,0 +1,46 @@
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+
+struct tree_decl
+{
+  union tree_decl_u1 {
+    int f;
+    long i;
+    struct tree_decl_u1_a {
+      unsigned int align : 24;
+      unsigned int off_align : 8;
+    } a;
+  } u1;
+};
+
+extern void abort (void);
+
+unsigned int
+assemble_variable (struct tree_decl decl)
+{
+  unsigned int align;
+
+  align = decl.u1.a.align;
+
+  if (align > (1 << ((8 * 4) < 64 ? (8 * 4) - 2 : 62)))
+    align = (1 << ((8 * 4) < 64 ? (8 * 4) - 2 : 62));
+
+  /* VRP should not be propagating 0 to the RHS of this assignment.
+     But it was erroneously applying a cast operation between types of
+     different precision.  align is an unsigned int with range [0,
+     0x4000000] but the .align field holds only 24 bits.  So the cast
+     was returning a [0, 0] range.  */
+  decl.u1.a.align = align;
+
+  return decl.u1.a.align;
+}
+
+main ()
+{
+  struct tree_decl decl;
+  decl.u1.a.align = 13;
+  unsigned int x = assemble_variable (decl);
+  if (x == 0)
+    abort ();
+  return 0;
+}

diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 8e79a46e17ff77591790f7d999ebd2a10dfec6f0..2bd527a231eb63a3fbad365c9cf3c2aae58b3329 100644 (file)
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -2422,7 +2422,7 @@ record_edge_info (basic_block bb)
            {
              tree labels = SWITCH_LABELS (stmt);
              int i, n_labels = TREE_VEC_LENGTH (labels);
-             tree *info = xcalloc (n_basic_blocks, sizeof (tree));
+             tree *info = xcalloc (last_basic_block, sizeof (tree));
              edge e;
              edge_iterator ei;
 

diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 74fb82994ac3334a19552b1ec9f6200c349f942d..373e8d9313557481f1726b32e20d8d0940347272 100644 (file)
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -1295,17 +1295,23 @@ extract_range_from_unary_expr (value_range_t *vr, tree expr)
     }
 
   /* Handle unary expressions on integer ranges.  */
-  if ((code == NOP_EXPR || code == CONVERT_EXPR)
-      && (TYPE_SIZE (TREE_TYPE (vr0.min)) != TYPE_SIZE (TREE_TYPE (expr))))
+  if (code == NOP_EXPR || code == CONVERT_EXPR)
     {
+      tree inner_type = TREE_TYPE (op0);
+      tree outer_type = TREE_TYPE (expr);
+
       /* When converting types of different sizes, set the result to
         VARYING.  Things like sign extensions and precision loss may
         change the range.  For instance, if x_3 is of type 'long long
         int' and 'y_5 = (unsigned short) x_3', if x_3 is ~[0, 0], it
         is impossible to know at compile time whether y_5 will be
         ~[0, 0].  */
-      set_value_range_to_varying (vr);
-      return;
+      if (TYPE_SIZE (inner_type) != TYPE_SIZE (outer_type)
+         || TYPE_PRECISION (inner_type) != TYPE_PRECISION (outer_type))
+       {
+         set_value_range_to_varying (vr);
+         return;
+       }
     }
 
   /* Apply the operation to each end of the range and see what we end