backport: re PR sanitizer/90954 (ICE: combining undefined behavior sanitizer with...

	Backported from mainline
	2019-06-25  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/90954
	* c-omp.c (c_finish_omp_atomic): Allow tree_invariant_p in addition
	to SAVE_EXPR in first operand of a COMPOUND_EXPR.

	* c-c++-common/gomp/pr90954.c: New test.

From-SVN: r275161

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7e77b0974de8803ff1cad9c0f7076524e5d688ce..5d5a8e5d479c779795c60e0df0686cdd5f234d86 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-30  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2019-06-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/90954
+       * c-omp.c (c_finish_omp_atomic): Allow tree_invariant_p in addition
+       to SAVE_EXPR in first operand of a COMPOUND_EXPR.
+
 2019-04-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * c-ada-spec.c (print_destructor): Deal with deleting destructors.

diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index eee718ddce10489fbfcbc0e8ff9c3e8325be1e65..0c3c455b54eff743d9ba2be4dd09f545f976463c 100644 (file)
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -256,7 +256,7 @@ c_finish_omp_atomic (location_t loc, enum tree_code code,
   if (TREE_CODE (x) == COMPOUND_EXPR)
     {
       pre = TREE_OPERAND (x, 0);
-      gcc_assert (TREE_CODE (pre) == SAVE_EXPR);
+      gcc_assert (TREE_CODE (pre) == SAVE_EXPR || tree_invariant_p (pre));
       x = TREE_OPERAND (x, 1);
     }
   gcc_assert (TREE_CODE (x) == MODIFY_EXPR);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ec7de87a3ec28e37f543cb24f5197ef7cbe3fe4..3d0337202023d5428a72bc4ba1b2c674b021b6e3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2019-08-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2019-06-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR sanitizer/90954
+       * c-c++-common/gomp/pr90954.c: New test.
+
        2019-06-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/90950

diff --git a/gcc/testsuite/c-c++-common/gomp/pr90954.c b/gcc/testsuite/c-c++-common/gomp/pr90954.c
new file mode 100644 (file)
index 0000000..cc3a6e9
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/pr90954.c
@@ -0,0 +1,27 @@
+/* PR sanitizer/90954 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp -fsanitize=undefined" } */
+
+float v;
+int i;
+
+void
+foo (float x, float y)
+{
+  #pragma omp atomic
+  v += x / y;
+}
+
+void
+bar (int x, int y)
+{
+  #pragma omp atomic
+  i += x / y;
+}
+
+void
+baz (int x, int y)
+{
+  #pragma omp atomic
+  i *= (x << y);
+}