backport: re PR middle-end/64824 (ICE in gimple verification)

	Backported from mainline
	2015-02-04  Jakub Jelinek  <jakub@redhat.com>

	PR c/64824
	PR c/64868
	* c-omp.c (c_finish_omp_atomic): Use TRUNC_DIV_EXPR
	instead of RDIV_EXPR.  Use build_binary_op instead of
	build2_loc.

	* c-parser.c (c_parser_omp_atomic): Handle RDIV_EXPR.

	* parser.c (cp_parser_omp_atomic): Handle RDIV_EXPR.

	* testsuite/libgomp.c/pr64824.c: New test.
	* testsuite/libgomp.c/pr64868.c: New test.
	* testsuite/libgomp.c++/pr64824.C: New test.
	* testsuite/libgomp.c++/pr64868.C: New test.

From-SVN: r220622

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index b1dc340691335d89fca7a3ad9bfa0657dd36b9ec..76cf06a2ab2eb4103e841919a90aa7691b210752 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,14 @@
+2015-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/64824
+       PR c/64868
+       * c-omp.c (c_finish_omp_atomic): Use TRUNC_DIV_EXPR
+       instead of RDIV_EXPR.  Use build_binary_op instead of
+       build2_loc.
+
 2015-02-11  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index 6a0e41988a714a7680fe00304cf5469b70d2ad8d..bdcedb22e813ea83f8edee5b4fca47397357e0f2 100644 (file)
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -156,6 +156,9 @@ c_finish_omp_atomic (location_t loc, enum tree_code code,
       return error_mark_node;
     }
 
+  if (opcode == RDIV_EXPR)
+    opcode = TRUNC_DIV_EXPR;
+
   /* ??? Validate that rhs does not overlap lhs.  */
 
   /* Take and save the address of the lhs.  From then on we'll reference it
@@ -190,7 +193,7 @@ c_finish_omp_atomic (location_t loc, enum tree_code code,
      to do this, and then take it apart again.  */
   if (swapped)
     {
-      rhs = build2_loc (loc, opcode, TREE_TYPE (lhs), rhs, lhs);
+      rhs = build_binary_op (loc, opcode, rhs, lhs, 1);
       opcode = NOP_EXPR;
     }
   bool save = in_late_binary_op;

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 57be674171d228da39448825b8e1c59777ef2428..972ea3572796788a54c14a1e9cdda871944c168c 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/64824
+       PR c/64868
+       * c-parser.c (c_parser_omp_atomic): Handle RDIV_EXPR.
+
 2015-02-01  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 264c17026eb2ba8ee0fb2b6e3950b79fa677af2b..66a9a16c7a80e4dbffd4a58c5868ddd1c598b58f 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -11423,6 +11423,7 @@ restart:
            {
            case MULT_EXPR:
            case TRUNC_DIV_EXPR:
+           case RDIV_EXPR:
            case PLUS_EXPR:
            case MINUS_EXPR:
            case LSHIFT_EXPR:

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 83bf91d54bc949f1ec8f5ef2924d07a34f303462..61640dd8e8ad272243f2804c6a9c386aa061c8a8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/64824
+       PR c/64868
+       * parser.c (cp_parser_omp_atomic): Handle RDIV_EXPR.
+
 2015-02-04  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        PR c++/64901

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 93f94d260c17bcaa12be679a25a8de244d45a2fb..18c706846bacec72eff659266d372b9e09640994 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -28748,6 +28748,7 @@ restart:
                {
                case MULT_EXPR:
                case TRUNC_DIV_EXPR:
+               case RDIV_EXPR:
                case PLUS_EXPR:
                case MINUS_EXPR:
                case LSHIFT_EXPR:

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 81c62da380bcbf3b3f8263e0d280d92c1fd38cdc..39f693d8d55435f3d97a84dc26d6e5b605398711 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,15 @@
+2015-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/64824
+       PR c/64868
+       * testsuite/libgomp.c/pr64824.c: New test.
+       * testsuite/libgomp.c/pr64868.c: New test.
+       * testsuite/libgomp.c++/pr64824.C: New test.
+       * testsuite/libgomp.c++/pr64868.C: New test.
+
 2015-01-23  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/64734

diff --git a/libgomp/testsuite/libgomp.c++/pr64824.C b/libgomp/testsuite/libgomp.c++/pr64824.C
new file mode 100644 (file)
index 0000000..348f6d6
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c++/pr64824.C
@@ -0,0 +1,5 @@
+// PR c/64824
+// { dg-do run }
+// { dg-options "-O2 -fopenmp" }
+
+#include "../libgomp.c/pr64824.c"

diff --git a/libgomp/testsuite/libgomp.c++/pr64868.C b/libgomp/testsuite/libgomp.c++/pr64868.C
new file mode 100644 (file)
index 0000000..2d730ac
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c++/pr64868.C
@@ -0,0 +1,5 @@
+// PR c/64868
+// { dg-do run }
+// { dg-options "-O2 -fopenmp" }
+
+#include "../libgomp.c/pr64868.c"

diff --git a/libgomp/testsuite/libgomp.c/pr64824.c b/libgomp/testsuite/libgomp.c/pr64824.c
new file mode 100644 (file)
index 0000000..544d0b0
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr64824.c
@@ -0,0 +1,16 @@
+/* PR c/64824 */
+/* { dg-do run } */
+/* { dg-options "-O2 -fopenmp" } */
+
+int
+main ()
+{
+  long long a;
+  long long b = 1LL;
+  int c = 3;
+#pragma omp atomic capture
+  a = b = c << b;
+  if (b != 6LL || a != 6LL)
+    __builtin_abort ();
+  return 0;
+}

diff --git a/libgomp/testsuite/libgomp.c/pr64868.c b/libgomp/testsuite/libgomp.c/pr64868.c
new file mode 100644 (file)
index 0000000..acdf998
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr64868.c
@@ -0,0 +1,87 @@
+/* PR c/64868 */
+/* { dg-do run } */
+/* { dg-options "-O2 -fopenmp" } */
+
+float f = 2.0f;
+double d = 4.0;
+long double ld = 8.0L;
+
+void
+foo ()
+{
+#pragma omp atomic
+  f = 1.0f / f;
+#pragma omp atomic
+  f = 1 / f;
+#pragma omp atomic
+  f = f / 2.0f;
+#pragma omp atomic
+  f = f / 2;
+#pragma omp atomic
+  f /= 2.0f;
+#pragma omp atomic
+  f /= 2;
+#pragma omp atomic
+  d = 1.0 / d;
+#pragma omp atomic
+  d = 1 / d;
+#pragma omp atomic
+  d = d / 2.0;
+#pragma omp atomic
+  d = d / 2;
+#pragma omp atomic
+  d /= 2.0;
+#pragma omp atomic
+  d /= 2;
+#pragma omp atomic
+  ld = 1.0L / ld;
+#pragma omp atomic
+  ld = 1 / ld;
+#pragma omp atomic
+  ld = ld / 2.0L;
+#pragma omp atomic
+  ld = ld / 2;
+#pragma omp atomic
+  ld /= 2.0L;
+#pragma omp atomic
+  ld /= 2;
+  if (f != 0.125f || d != 0.25 || ld != 0.5L)
+    __builtin_abort ();
+}
+
+#ifdef __cplusplus
+template <typename T, int N1, int N2>
+void
+bar ()
+{
+  T v = ::d;
+#pragma omp atomic
+  v *= 16;
+#pragma omp atomic
+  v = 1.0 / v;
+#pragma omp atomic
+  v = N1 / v;
+#pragma omp atomic
+  v = v / 2.0;
+#pragma omp atomic
+  v = v / N2;
+#pragma omp atomic
+  v /= 2.0;
+#pragma omp atomic
+  v /= N2;
+  if (v != 0.25)
+    __builtin_abort ();
+}
+#endif
+
+int
+main ()
+{
+  foo ();
+#ifdef __cplusplus
+  bar<float, 1, 2> ();
+  bar<double, 1, 2> ();
+  bar<long double, 1, 2> ();
+#endif
+  return 0;
+}