]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
OpenMP: Avoid ICE in c_parser_omp_clause_allocate with invalid expr
authorTobias Burnus <tobias@codesourcery.com>
Tue, 5 Sep 2023 12:57:01 +0000 (14:57 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Tue, 5 Sep 2023 14:49:18 +0000 (16:49 +0200)
gcc/c/ChangeLog:

* c-parser.cc (c_parser_omp_clause_allocate): Handle
error_mark_node.

gcc/testsuite/ChangeLog:

* c-c++-common/gomp/allocate-13.c: New test.

gcc/c/c-parser.cc
gcc/testsuite/c-c++-common/gomp/allocate-13.c [new file with mode: 0644]

index cae10ba9c80e4252a9f44dc3cf9f9a7b2c789518..c8d285fbda132005b62078e70ee39da540fc5062 100644 (file)
@@ -16676,7 +16676,9 @@ c_parser_omp_clause_allocate (c_parser *parser, tree list)
              location_t expr_loc = c_parser_peek_token (parser)->location;
              c_expr expr = c_parser_expr_no_commas (parser, NULL);
              expr = convert_lvalue_to_rvalue (expr_loc, expr, false, true);
-             if (strcmp (p, "allocator") == 0)
+             if (expr.value == error_mark_node)
+               ;
+             else if (strcmp (p, "allocator") == 0)
                {
                  allocator = expr.value;
                  allocator = c_fully_fold (allocator, false, NULL);
diff --git a/gcc/testsuite/c-c++-common/gomp/allocate-13.c b/gcc/testsuite/c-c++-common/gomp/allocate-13.c
new file mode 100644 (file)
index 0000000..847fe55
--- /dev/null
@@ -0,0 +1,28 @@
+typedef enum omp_allocator_handle_t
+#if __cplusplus >= 201103L
+: __UINTPTR_TYPE__
+#endif
+{
+  omp_null_allocator = 0,
+  omp_default_mem_alloc = 1,
+  omp_large_cap_mem_alloc = 2,
+  omp_const_mem_alloc = 3,
+  omp_high_bw_mem_alloc = 4,
+  omp_low_lat_mem_alloc = 5,
+  omp_cgroup_mem_alloc = 6,
+  omp_pteam_mem_alloc = 7,
+  omp_thread_mem_alloc = 8,
+  __omp_allocator_handle_t_max__ = __UINTPTR_MAX__
+} omp_allocator_handle_t;
+
+void
+f ()
+{
+  int i;
+  #pragma omp parallel firstprivate(i) \
+        allocate(allocator(omp_low_latency_mem_alloc): i)
+/* { dg-error "'omp_low_latency_mem_alloc' undeclared \\(first use in this function\\); did you mean 'omp_low_lat_mem_alloc'\\\?" "" { target c } .-1 } */
+/* { dg-error "'omp_low_latency_mem_alloc' was not declared in this scope; did you mean 'omp_low_lat_mem_alloc'\\\?" "" { target c++ } .-2 } */
+/* { dg-note "each undeclared identifier is reported only once for each function it appears in" "" { target c } .-3 } */
+   i = 4;
+}