* gimplify.c (goa_lhs_expr_p): Allow different ADDR_EXPR nodes

	for the same VAR_DECL.

	* testsuite/libgomp.c/atomic-3.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132977 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e39eae7..4bc1c28 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * gimplify.c (goa_lhs_expr_p): Allow different ADDR_EXPR nodes
+       for the same VAR_DECL.
+
 2008-03-06  Tom Tromey  <tromey@redhat.com>
 
        * treelang: Delete.

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 04ed39c..cb7460e 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -5464,7 +5464,10 @@ goa_lhs_expr_p (tree expr, tree addr)
          expr = TREE_OPERAND (expr, 0);
          addr = TREE_OPERAND (addr, 0);
        }
-      return expr == addr;
+      if (expr == addr)
+       return true;
+      return (TREE_CODE (addr) == ADDR_EXPR && TREE_CODE (expr) == ADDR_EXPR
+             && TREE_OPERAND (addr, 0) == TREE_OPERAND (expr, 0));
     }
   if (TREE_CODE (addr) == ADDR_EXPR && expr == TREE_OPERAND (addr, 0))
     return true;

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 6e978d9..84c7049 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,7 +1,11 @@
+2008-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * testsuite/libgomp.c/atomic-3.c: New test.
+
 2008-03-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR fortran/33197
-       * libgomp/testsuite/libgomp.fortran/fortran.exp: Add .f08 and
+       * testsuite/libgomp.fortran/fortran.exp: Add .f08 and
        .F08 file suffixes.
 
 2008-03-03  Peter O'Gorman  <pogma@thewrittenword.com>

diff --git a/libgomp/testsuite/libgomp.c/atomic-3.c b/libgomp/testsuite/libgomp.c/atomic-3.c
new file mode 100644 (file)
index 0000000..5b8fdc1
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/atomic-3.c
@@ -0,0 +1,50 @@
+/* { dg-do run } */
+/* { dg-options "-fopenmp -O0" } */
+
+#include <omp.h>
+#include <stdlib.h>
+
+short e[64];
+int g;
+_Complex double d, f;
+int num_threads;
+
+__attribute__((noinline)) void
+foo (int x, long long y)
+{
+#pragma omp parallel num_threads (4)
+  {
+    int i;
+    #pragma omp barrier
+    for (i = 0; i < 2400; i++)
+      {
+       if (i == 0)
+         num_threads = omp_get_num_threads ();
+       #pragma omp atomic
+         e[0] += x;
+       #pragma omp atomic
+         e[16] += x;
+       #pragma omp atomic
+         g += y;
+       #pragma omp atomic
+         __real__ d += x;
+       #pragma omp atomic
+         __imag__ f += x;
+      }
+  }
+}
+
+int
+main (void)
+{
+  int i;
+  foo (3, 3LL);
+  if (g != 3 * 2400 * num_threads
+      || __real__ d != g || __imag__ d != 0
+      || __real__ f != 0 || __imag__ f != g)
+    abort ();
+  for (i = 0; i < 64; i++)
+    if (e[i] != ((i && i != 16) ? 0 : g))
+      abort ();
+  return 0;
+}