backport: re PR c++/92504 (ICE on gcc-9 -fopenmp: internal compiler error: tree check...

	Backported from mainline
	2019-11-19  Jakub Jelinek  <jakub@redhat.com>

	PR c++/92504
	* semantics.c (handle_omp_for_class_iterator): Don't call
	cp_fully_fold on cond.

	* g++.dg/gomp/pr92504.C: New test.

From-SVN: r278488

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f44fdee6aa1b6bde4ee68fc0440b259627f6bcba..c2928b372348176adffc211cd01fadff313fc599 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2019-11-20  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2019-11-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92504
+       * semantics.c (handle_omp_for_class_iterator): Don't call
+       cp_fully_fold on cond.
+
 2019-11-08  Marek Polacek  <polacek@redhat.com>
 
        Backported from mainline

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index ebfdf9a47b0ce29304e804b59f13ce18107d61ea..b8a279f8b08be701882ecc7be098786533562257 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -8194,7 +8194,6 @@ handle_omp_for_class_iterator (int i, location_t locus, enum tree_code code,
   if (init && EXPR_HAS_LOCATION (init))
     elocus = EXPR_LOCATION (init);
 
-  cond = cp_fully_fold (cond);
   switch (TREE_CODE (cond))
     {
     case GT_EXPR:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e538f1ba5fd762f698f8fe5fd93b83eb70e46938..46dd927c0507212fd122f720b8cff605e588f10f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2019-11-20  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2019-11-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/92504
+       * g++.dg/gomp/pr92504.C: New test.
+
 2019-11-19  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/91450

diff --git a/gcc/testsuite/g++.dg/gomp/pr92504.C b/gcc/testsuite/g++.dg/gomp/pr92504.C
new file mode 100644 (file)
index 0000000..8df6762
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr92504.C
@@ -0,0 +1,29 @@
+// PR c++/92504
+// { dg-do compile { target c++11 } }
+// { dg-additional-options "-O2" }
+
+namespace std {
+  typedef __SIZE_TYPE__ size_t;
+  typedef __PTRDIFF_TYPE__ ptrdiff_t;
+}
+
+struct A {
+  A ();
+  A (const A &);
+  A & operator++ ();
+  bool operator != (const A &) const;
+  std::ptrdiff_t operator - (const A &);
+  A & operator += (std::size_t);
+  int a;
+  A & begin ();
+  A & end ();                          // { dg-message "declared here" }
+};
+
+void
+bar ()
+{
+  A a;
+  #pragma omp for
+  for (auto b = a; b != a.end; ++b)    // { dg-error "invalid use of non-static member function" }
+    ;
+}