openmp: Be consistent on parsing offsets between normal sink vector and omp_cur_itera...

For normal sink vectors, we just check that the token is CPP_NUMBER and with
INTEGER_CST value, while for omp_cur_iteration I was additionally requiring
integer_type_node type (so only 1, 001, 0x0001 but not 1L or 1ULL etc.).
I think we need to clarify what we actually should allow in the standard, until
then it is better to be consistent.

2022-09-06  Jakub Jelinek  <jakub@redhat.com>

gcc/c/
	* c-parser.cc (c_parser_omp_clause_doacross_sink): Don't verify val
	in omp_cur_iteration - 1 has integer_type_node type.
gcc/cp/
	* parser.cc (cp_parser_omp_clause_doacross_sink): Don't verify val
	in omp_cur_iteration - 1 has integer_type_node type.
gcc/testsuite/
	* c-c++-common/gomp/doacross-6.c (corge): Don't expect an error here.
	Add a few further tests.

(cherry picked from commit 0bd514107de7b0f643aa72554b3bdb5aeb5aa0f5)

diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp
index 32940146b60991d1fe75413f863bfb8058e3a056..9d15f19b98d0802448d953e0decd36eaeb9b5518 100644 (file)
--- a/gcc/c/ChangeLog.omp
+++ b/gcc/c/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * c-parser.cc (c_parser_omp_clause_doacross_sink): Don't verify val
+       in omp_cur_iteration - 1 has integer_type_node type.
+
 2022-09-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index 70b72ad6fd72f72d1397fa107f9cb809a7e3174d..36450a43bebca938455776337c390ead3db3ac27 100644 (file)
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -16170,8 +16170,7 @@ c_parser_omp_clause_doacross_sink (c_parser *parser, location_t clause_loc,
          && c_parser_peek_nth_token (parser, 4)->type == CPP_CLOSE_PAREN)
        {
          tree val = c_parser_peek_nth_token (parser, 3)->value;
-         if (integer_onep (val)
-             && comptypes (TREE_TYPE (val), integer_type_node))
+         if (integer_onep (val))
            {
              c_parser_consume_token (parser);
              c_parser_consume_token (parser);

diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp
index 07e7be2f819a40a1e8eae1eb0464a6f80ec2a894..97a956f02456be90a82cf2508d950a3e9ae70849 100644 (file)
--- a/gcc/cp/ChangeLog.omp
+++ b/gcc/cp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * parser.cc (cp_parser_omp_clause_doacross_sink): Don't verify val
+       in omp_cur_iteration - 1 has integer_type_node type.
+
 2022-09-05  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 4c82ad150a2317a41f5b72a14bd136903bb6bee9..93283f7a509cdfd5f4b46ac8d2f8b436d9512229 100644 (file)
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -39354,8 +39354,7 @@ cp_parser_omp_clause_doacross_sink (cp_parser *parser, location_t clause_loc,
          && cp_lexer_nth_token_is (parser->lexer, 4, CPP_CLOSE_PAREN))
        {
          tree val = cp_lexer_peek_nth_token (parser->lexer, 3)->u.value;
-         if (integer_onep (val)
-             && same_type_p (TREE_TYPE (val), integer_type_node))
+         if (integer_onep (val))
            {
              cp_lexer_consume_token (parser->lexer);
              cp_lexer_consume_token (parser->lexer);

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 58d89825dd03214f1910222b897e43d000526a21..0d64c7a6d408f6bf6d876d068c99059e98d011e2 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+       * c-c++-common/gomp/doacross-6.c (corge): Don't expect an error here.
+       Add a few further tests.
+
 2022-07-06  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/c-c++-common/gomp/doacross-6.c b/gcc/testsuite/c-c++-common/gomp/doacross-6.c
index d126ad1bb2de1a5de2f4bb2536590d918600a0da..b948d07cd22b9ec39cd11152a4b3d1f2dec539ce 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/doacross-6.c
+++ b/gcc/testsuite/c-c++-common/gomp/doacross-6.c
@@ -69,6 +69,26 @@ corge (int n)
   #pragma omp for ordered
   for (i = 0; i < 8; i += n)
     {
-      #pragma omp ordered doacross(sink:omp_cur_iteration - 1LL)       /* { dg-error "'omp_cur_iteration' undeclared \\\(first use in this function\\\)" "" { target c } } */
-    }                                                                  /* { dg-error "'omp_cur_iteration' has not been declared" "" { target c++ } .-1 } */
+      #pragma omp ordered doacross(sink:omp_cur_iteration - 1)
+    }
+  #pragma omp for ordered
+  for (i = 0; i < 8; i += n)
+    {
+      #pragma omp ordered doacross(sink:omp_cur_iteration - 1LL)
+    }
+  #pragma omp for ordered
+  for (i = 0; i < 8; i += n)
+    {
+      #pragma omp ordered doacross(sink:omp_cur_iteration - 0x00001)
+    }
+  #pragma omp for ordered
+  for (i = 0; i < 8; i += n)
+    {
+      #pragma omp ordered doacross(sink:omp_cur_iteration - 001)
+    }
+  #pragma omp for ordered
+  for (i = 0; i < 8; i += n)
+    {
+      #pragma omp ordered doacross(sink:omp_cur_iteration - 1ULL)
+    }
 }