[gcc r12-2904] Adjust 'libgomp.oacc-c-c++-common/static-variable-1.c'

[gcc r12-2904] Adjust 'libgomp.oacc-c-c++-common/static-variable-1.c'

[Thomas Schwinge]

https://gcc.gnu.org/g:2cc65fcbd470de8240f64317629a60fab879dfc5

commit r12-2904-g2cc65fcbd470de8240f64317629a60fab879dfc5
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Fri Aug 13 10:23:30 2021 +0200

    Adjust 'libgomp.oacc-c-c++-common/static-variable-1.c'
    
    ... for 'gcc/gimplify.c:gimplify_scan_omp_clauses' changes in recent
    commit d0befed793b94f3f407be44e6f69f81a02f5f073 "openmp: Add support
    for OpenMP 5.1 masked construct".
    
            libgomp/
            * testsuite/libgomp.oacc-c-c++-common/static-variable-1.c: Adjust.

Diff:
---
 libgomp/testsuite/libgomp.oacc-c-c++-common/static-variable-1.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-variable-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-variable-1.c
index ceb2c88d3e5..69df0a6dd1d 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/static-variable-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/static-variable-1.c
@@ -298,7 +298,10 @@ static void t2(void)
 
 #pragma acc data \
   copy(results_1, results_2, results_3)
-  /* { dg-note {variable 'i' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-2 } */
+  /* { dg-note {variable 'num_gangs_request_1\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target { c && { ! __OPTIMIZE__ } } } .-2 } */
+  /* { dg-note {variable 'num_gangs_request_2\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target { c && { ! __OPTIMIZE__ } } } .-3 } */
+  /* { dg-note {variable 'num_gangs_request_3\.[0-9]+' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target { c && { ! __OPTIMIZE__ } } } .-4 } */
+  /* { dg-note {variable 'i' declared in block isn't candidate for adjusting OpenACC privatization level: not addressable} "" { target *-*-* } .-5 } */
   {
     for (int i = 0; i < i_limit; ++i)
       {