[gcc/devel/omp/gcc-11] Revert "gomp/pr94874.c: Update scan-tree-dump"

[gcc/devel/omp/gcc-11] Revert "gomp/pr94874.c: Update scan-tree-dump"

[Tobias Burnus]

https://gcc.gnu.org/g:adda89fd07129b47191295f861a5c135094e3809

commit adda89fd07129b47191295f861a5c135094e3809
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue Jun 15 11:21:15 2021 +0200

    Revert "gomp/pr94874.c: Update scan-tree-dump"
    
    This reverts commit 8a287a0465a9a1c6c8678f9ceed5de44bb8e1bd3.
    That commit was needed as g++ on OG10 adds an additional temporaries
    compared to mainline. This is not the case on OG11. Hence back
    to the mainline version:
    
    testsuite/ChangeLog.omp
            Revert:
            2020-09-28  Tobias Burnus  <tobias@codesourcery.com>
    
            * c-c++-common/gomp/pr94874.c: Update scan-tree-dump.

Diff:
---
 gcc/testsuite/ChangeLog.omp               | 7 +++++++
 gcc/testsuite/c-c++-common/gomp/pr94874.c | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index cf4b5e5e155..ef9ecf6e433 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
+2021-06-15  Tobias Burnus  <tobias@codesourcery.com>
+
+	Revert:
+	2020-09-28  Tobias Burnus  <tobias@codesourcery.com>
+
+	* c-c++-common/gomp/pr94874.c: Update scan-tree-dump.
+
 2021-06-15  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/c-c++-common/gomp/pr94874.c b/gcc/testsuite/c-c++-common/gomp/pr94874.c
index 1fed201b8b8..9c67f83a5da 100644
--- a/gcc/testsuite/c-c++-common/gomp/pr94874.c
+++ b/gcc/testsuite/c-c++-common/gomp/pr94874.c
@@ -18,9 +18,8 @@ vla (int array_li)
   return size1 + size2;
 }
 
+/* { dg-final { scan-tree-dump "omp parallel .*shared\\(array_li\.\[0-9\]\\)" "gimple" } } */
 /* C */
-/* { dg-final { scan-tree-dump "omp parallel .*shared\\(array_li\.\[0-9\]\\)" "gimple" { target { ! c++ } } } } */
 /* { dg-final { scan-tree-dump "omp target .*private\\(array_li\.\[0-9\]\\)" "gimple" { target { ! c++ } } } } */
 /* C++ */
-/* { dg-final { scan-tree-dump "omp parallel .*shared\\(D\.\[0-9\]+\\)" "gimple" { target { c++ } } } } */
-/* { dg-final { scan-tree-dump "omp target .*firstprivate\\(D\.\[0-9\]+\\)" "gimple" { target { c++ } } } } */
+/* { dg-final { scan-tree-dump "omp target .*firstprivate\\(array_li\.\[0-9\]\\)" "gimple" { target { c++ } } } } */