re PR rtl-optimization/23324 (unsigned bitfield in struct not accessed correctly...

        PR rtl-opt/23324
        * cfgexpand.c (add_alias_set_conflicts): Use objects_must_conflict_p.

From-SVN: r105306

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d78b4d..d66f28e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-12  Richard Henderson  <rth@redhat.com>
+
+       PR rtl-opt/23324
+       * cfgexpand.c (add_alias_set_conflicts): Use objects_must_conflict_p.
+
 2005-10-12  Richard Guenther  <rguenther@suse.de>
 
        * Makefile.in (CGRAPH_H): Depend on $(TREE_H).

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 7c58e55..69546bf 100644 (file)
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -285,14 +285,14 @@ add_alias_set_conflicts (void)
 
   for (i = 0; i < n; ++i)
     {
-      bool aggr_i = AGGREGATE_TYPE_P (TREE_TYPE (stack_vars[i].decl));
-      HOST_WIDE_INT set_i = get_alias_set (stack_vars[i].decl);
+      tree type_i = TREE_TYPE (stack_vars[i].decl);
+      bool aggr_i = AGGREGATE_TYPE_P (type_i);
 
       for (j = 0; j < i; ++j)
        {
-         bool aggr_j = AGGREGATE_TYPE_P (TREE_TYPE (stack_vars[j].decl));
-         HOST_WIDE_INT set_j = get_alias_set (stack_vars[j].decl);
-         if (aggr_i != aggr_j || !alias_sets_conflict_p (set_i, set_j))
+         tree type_j = TREE_TYPE (stack_vars[j].decl);
+         bool aggr_j = AGGREGATE_TYPE_P (type_j);
+         if (aggr_i != aggr_j || !objects_must_conflict_p (type_i, type_j))
            add_stack_var_conflict (i, j);
        }
     }

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23324.c b/gcc/testsuite/gcc.c-torture/execute/pr23324.c
new file mode 100644 (file)
index 0000000..c5f88f7
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr23324.c
@@ -0,0 +1,133 @@
+extern void abort (void);
+#define A(x) if (!(x)) abort ()
+
+static union at6 {} vv6 = {};
+static struct et6
+{
+  struct bt6
+  {
+    signed av6:6;
+    signed bv6:7;
+    signed cv6:6;
+    signed dv6:5;
+    unsigned char ev6;
+    unsigned int fv6;
+    long int gv6;
+  } mv6;
+  unsigned long int nv6;
+  signed ov6:12;
+  signed pv6:3;
+  signed qv6:2;
+  signed rv6:10;
+  union ct6 { long int hv6; float iv6; float jv6; } sv6;
+  int *tv6;
+  union dt6 { double kv6; float lv6; } uv6;
+} wv6 = {
+  { 8, 9, 2, 4, '\x10', 67426805U, 1047191860L },
+  1366022414UL, 858, 1, 1, 305,
+  { 1069379046L }, (int *) 358273621U,
+  { 3318.041978 }
+};
+static double xv6 = 19239.101269;
+static long long int yv6 = 1207859169L;
+static int zv6 = 660195606;
+
+static union at6
+callee_af6 (struct et6 ap6, double bp6, long long int cp6, int dp6)
+{
+  A (wv6.mv6.av6 == ap6.mv6.av6);
+  A (wv6.mv6.bv6 == ap6.mv6.bv6);
+  A (wv6.mv6.cv6 == ap6.mv6.cv6);
+  A (wv6.mv6.dv6 == ap6.mv6.dv6);
+  A (wv6.mv6.ev6 == ap6.mv6.ev6);
+  A (wv6.mv6.fv6 == ap6.mv6.fv6);
+  A (wv6.mv6.gv6 == ap6.mv6.gv6);
+  A (wv6.nv6 == ap6.nv6);
+  A (wv6.ov6 == ap6.ov6);
+  A (wv6.pv6 == ap6.pv6);
+  A (wv6.qv6 == ap6.qv6);
+  A (wv6.rv6 == ap6.rv6);
+  A (wv6.sv6.hv6 == ap6.sv6.hv6);
+  A (wv6.tv6 == ap6.tv6);
+  A (wv6.uv6.kv6 == ap6.uv6.kv6);
+  A (xv6 == bp6);
+  A (yv6 == cp6);
+  A (zv6 == dp6);
+  return vv6;
+}
+
+static void
+caller_bf6 (void)
+{
+  union at6 bav6;
+  bav6 = callee_af6 (wv6, xv6, yv6, zv6);
+}
+
+static unsigned char uv7 = '\x46';
+static float vv7 = 96636.982442;
+static double wv7 = 28450.711801;
+static union ct7 {} xv7 = {};
+static struct et7
+{
+  struct dt7
+  {
+    float iv7;
+    unsigned short int jv7;
+  } kv7;
+  float lv7[0];
+  signed mv7:9;
+  short int nv7;
+  double ov7;
+  float pv7;
+} yv7 = {
+  { 30135.996213, 42435 },
+  {}, 170, 22116, 26479.628148, 4082.960685
+};
+static union ft7
+{
+  float qv7;
+  float *rv7;
+  unsigned int *sv7;
+} zv7 = { 5042.227886 };
+static int bav7 = 1345451862;
+static struct gt7 { double tv7; } bbv7 = { 47875.491954 };
+static long int bcv7[1] = { 1732133482L };
+static long long int bdv7 = 381678602L;
+
+static unsigned char
+callee_af7 (float ap7, double bp7, union ct7 cp7, struct et7 dp7,
+            union ft7 ep7, int fp7, struct gt7 gp7, long int hp7[1],
+            long long int ip7)
+{
+  A (vv7 == ap7);
+  A (wv7 == bp7);
+  A (yv7.kv7.iv7 == dp7.kv7.iv7);
+  A (yv7.kv7.jv7 == dp7.kv7.jv7);
+  A (yv7.mv7 == dp7.mv7);
+  A (yv7.nv7 == dp7.nv7);
+  A (yv7.ov7 == dp7.ov7);
+  A (yv7.pv7 == dp7.pv7);
+  A (zv7.qv7 == ep7.qv7);
+  A (bav7 == fp7);
+  A (bbv7.tv7 == gp7.tv7);
+  A (bcv7[0] == hp7[0]);
+  A (bdv7 == ip7);
+  return uv7;
+}
+
+static void
+caller_bf7 (void)
+{
+  unsigned char bev7;
+
+  bev7 = callee_af7 (vv7, wv7, xv7, yv7, zv7, bav7, bbv7, bcv7, bdv7);
+  A (uv7 == bev7);
+}
+
+int
+main ()
+{
+  caller_bf6 ();
+  caller_bf7 ();
+  return 0;
+}