KJ16609/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2026-02-21 19:35:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

OpenMP: Unshare expr in context-selector condition [PR121922]

Browse Source 
As the testcase shows, a missing unshare_expr caused that the condition
was only evaluated once instead of every time when a 'declare variant'
was resolved.

	PR middle-end/121922

gcc/ChangeLog:

	* omp-general.cc (omp_dynamic_cond): Use 'unshare_expr' for
	the user condition.

libgomp/ChangeLog:

	* testsuite/libgomp.c-c++-common/declare-variant-1.c: New test.

Co-authored-by: Sandra Loosemore <sloosemore@baylibre.com>
This commit is contained in:
Tobias Burnus
2025-09-18 11:07:50 +02:00
parent c30f58c3f7
commit 97c1d2fa97
2 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/omp-general.cc
View File

@@ -2733,7 +2733,7 @@ omp_dynamic_cond (tree ctx, tree supercontext)
/* The user condition is not dynamic if it is constant. */
if (!tree_fits_shwi_p (expr))
user_cond = expr;
user_cond = unshare_expr (expr);
}
/* Build the "target_device" part of the dynamic selector. In the

40
libgomp/testsuite/libgomp.c-c++-common/declare-variant-1.c Normal file
View File

@@ -0,0 +1,40 @@
/* { dg-do run } */
/* { dg-additional-options "-fdump-tree-gimple" } */
/* PR middle-end/121922 */
/* Failed to re-check the global flag due to tree sharing. */
extern int flag;
int flag = 0;
int
test_with_flag ()
{
return flag;
}
#pragma omp declare variant (test_with_flag) match (user={condition(score(10): flag > 1)})
int
test ()
{
return 0;
}
void
doit ()
{
flag = 0;
if (test () != 0) __builtin_abort ();
flag = 1;
if (test () != 0) __builtin_abort ();
flag = 42;
if (test () != 42) __builtin_abort ();
}
int main ()
{
doit ();
}
/* { dg-final { scan-tree-dump-times "flag\\.\[^=\]*= flag;\[\n\r\]+ *if \\(flag\\.\[^>\]*> 1\\)" 3 "gimple" } } */