[clang] [OpenMP] Allow dispatch when the call is replaced by a declare variant (PR #242482)

Zahira Ammarguellat via cfe-commits cfe-commits at lists.llvm.org
Fri Nov 13 12:57:08 PST 2026


https://github.com/zahiraam updated https://github.com/llvm/llvm-project/pull/242482

>From f9f12e25d514a508973843a41f7242736c189253 Mon Sep 17 00:00:00 2001
From: Zahira Ammarguellat <zahira.ammarguellat at intel.com>
Date: Fri, 13 Nov 2026 12:50:59 -0800
Subject: [PATCH] [OpenMP] Allow dispatch when the call is replaced by a
 declare variant.

---
 clang/lib/Sema/SemaOpenMP.cpp                 |  5 +++
 .../test/OpenMP/dispatch_variant_construct.c  | 45 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 clang/test/OpenMP/dispatch_variant_construct.c

diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 257ee6e4d0389..bc208c2029cfe 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -4861,6 +4861,8 @@ static void handleDeclareVariantConstructTrait(DSAStackTy *Stack,
   SmallVector<llvm::omp::TraitProperty, 8> Traits;
   if (isOpenMPTargetExecutionDirective(DKind))
     Traits.emplace_back(llvm::omp::TraitProperty::construct_target_target);
+  if (DKind == OMPD_dispatch)
+    Traits.emplace_back(llvm::omp::TraitProperty::construct_dispatch_dispatch);
   if (isOpenMPTeamsDirective(DKind))
     Traits.emplace_back(llvm::omp::TraitProperty::construct_teams_teams);
   if (isOpenMPParallelDirective(DKind))
@@ -11812,6 +11814,9 @@ StmtResult SemaOpenMP::ActOnOpenMPSectionDirective(Stmt *AStmt,
 
 static Expr *getDirectCallExpr(Expr *E) {
   E = E->IgnoreParenCasts()->IgnoreImplicit();
+  // A call replaced by a declare variant keeps the original call.
+  if (auto *POE = dyn_cast<PseudoObjectExpr>(E))
+    E = POE->getSyntacticForm()->IgnoreParenCasts()->IgnoreImplicit();
   if (auto *CE = dyn_cast<CallExpr>(E))
     if (CE->getDirectCallee())
       return E;
diff --git a/clang/test/OpenMP/dispatch_variant_construct.c b/clang/test/OpenMP/dispatch_variant_construct.c
new file mode 100644
index 0000000000000..02c3dcd4ecd0e
--- /dev/null
+++ b/clang/test/OpenMP/dispatch_variant_construct.c
@@ -0,0 +1,45 @@
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=51 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=52 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=51 -ast-dump %s | FileCheck %s
+
+// expected-no-diagnostics
+
+// The call under dispatch can be replaced by a variant that matches the
+// dispatch construct.
+
+void f_par(void) {}
+void f_par_dispatch(void) {}
+
+#pragma omp declare variant(f_par) match(construct = {parallel})
+#pragma omp declare variant(f_par_dispatch)                                   \
+    match(construct = {parallel, dispatch})
+void f(void) {}
+
+void g_dispatch(void) {}
+
+#pragma omp declare variant(g_dispatch) match(construct = {dispatch})
+void g(void) {}
+
+// CHECK-LABEL: FunctionDecl {{.*}} test_parallel
+// CHECK:       OMPDispatchDirective
+// CHECK:       PseudoObjectExpr
+// CHECK:       DeclRefExpr {{.*}} 'f' 'void (void)'
+// CHECK:       DeclRefExpr {{.*}} 'f_par_dispatch' 'void (void)'
+void test_parallel(void) {
+#pragma omp parallel
+  {
+#pragma omp dispatch
+    f();
+  }
+}
+
+// CHECK-LABEL: FunctionDecl {{.*}} test_top_level
+// CHECK:       OMPDispatchDirective
+// CHECK:       PseudoObjectExpr
+// CHECK:       DeclRefExpr {{.*}} 'g' 'void (void)'
+// CHECK:       DeclRefExpr {{.*}} 'g_dispatch' 'void (void)'
+void test_top_level(void) {
+#pragma omp dispatch
+  g();
+}



More information about the cfe-commits mailing list