[Clang][OpenMP] Bug fix Default clause variable category #168112
Merged
+94
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang Author: None (SunilKuravinakop) ChangesFollow-up fix for #165276: remove unnecessary <vector> include in test to restore Ubuntu build. Full diff: https://github.com/llvm/llvm-project/pull/168112.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 81c591a00cfc6..31c8f0cd30c56 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -1364,15 +1364,15 @@ DSAStackTy::DSAVarData DSAStackTy::getDSA(const_iterator &Iter,
DefaultDataSharingAttributes IterDA = Iter->DefaultAttr;
switch (Iter->DefaultVCAttr) {
case DSA_VC_aggregate:
- if (!VD->getType()->isAggregateType())
+ if (!D->getType()->isAggregateType())
IterDA = DSA_none;
break;
case DSA_VC_pointer:
- if (!VD->getType()->isPointerType())
+ if (!D->getType()->isPointerType())
IterDA = DSA_none;
break;
case DSA_VC_scalar:
- if (!VD->getType()->isScalarType())
+ if (!D->getType()->isScalarType())
IterDA = DSA_none;
break;
case DSA_VC_all:
diff --git a/clang/test/OpenMP/parallel_default_variableCategory_codegen.cpp b/clang/test/OpenMP/parallel_default_variableCategory_codegen.cpp
new file mode 100644
index 0000000000000..ffafc9a9410b7
--- /dev/null
+++ b/clang/test/OpenMP/parallel_default_variableCategory_codegen.cpp
@@ -0,0 +1,91 @@
+// RUN: %clangxx -Xclang -verify -Wno-vla -fopenmp -fopenmp-version=60 -x c++ -S -emit-llvm %s -o - | FileCheck %s
+// expected-no-diagnostics
+#ifndef HEADER
+#define HEADER
+
+int global;
+#define VECTOR_SIZE 4
+
+int main (int argc, char **argv) {
+ int i,n;
+ int x;
+
+ n = VECTOR_SIZE;
+
+ #pragma omp parallel masked firstprivate(x) num_threads(2)
+ {
+ int *xPtr = nullptr;
+ // scalar
+ #pragma omp task default(shared:scalar)
+ {
+ xPtr = &x;
+ }
+ #pragma omp taskwait
+
+ // pointer
+ #pragma omp task default(shared:pointer) shared(x)
+ {
+ xPtr = &x;
+ }
+ #pragma omp taskwait
+ }
+
+ int *aggregate[VECTOR_SIZE] = {0,0,0,0};
+
+ #pragma omp parallel masked num_threads(2)
+ {
+ // aggregate
+ #pragma omp task default(shared:aggregate)
+ for(i=0;i<n;i++) {
+ aggregate[i] = &x;
+ }
+ #pragma omp taskwait
+
+ #pragma omp task default(shared:aggregate) shared(x)
+ for(i=0;i<n;i++) {
+ aggregate[i] = &x;
+ }
+ #pragma omp taskwait
+
+ // all
+ #pragma omp task default(shared:all)
+ for(i=0;i<n;i++) {
+ aggregate[i] = &x;
+ }
+ #pragma omp taskwait
+ }
+}
+
+#endif
+
+// CHECK-LABEL: define {{.*}}main.omp_outlined{{.*}}
+// CHECK-NEXT: entry:
+// CHECK: %x.addr = alloca{{.*}}
+// CHECK: %xPtr = alloca{{.*}}
+// CHECK: store ptr null, ptr %xPtr{{.*}}
+// CHECK: store ptr %xPtr{{.*}}
+// CHECK: store ptr %x.addr{{.*}}
+// CHECK-NEXT: {{.*}}call{{.*}}__kmpc_omp_task_alloc{{.*}}
+// CHECK: ret void
+//
+// CHECK: define {{.*}}main.omp_outlined{{.*}}
+// CHECK-NEXT: entry:
+// CHECK-DAG: %i.addr = alloca{{.*}}
+// CHECK-DAG: %n.addr = alloca{{.*}}
+// CHECK-DAG: %aggregate.addr = alloca{{.*}}
+// CHECK-DAG: %x.addr = alloca{{.*}}
+// CHECK: [[TMP0:%.*]] = load{{.*}}%i.addr{{.*}}
+// CHECK-NEXT: [[TMP1:%.*]] = load{{.*}}%n.addr{{.*}}
+// CHECK-NEXT: [[TMP2:%.*]] = load{{.*}}%aggregate.addr{{.*}}
+// CHECK-NEXT: [[TMP3:%.*]] = load{{.*}}%x.addr{{.*}}
+// CHECK: store ptr [[TMP2]]{{.*}}
+// CHECK-NEXT: {{.*}}call{{.*}}__kmpc_omp_task_alloc{{.*}}
+// CHECK: store ptr [[TMP2]]{{.*}}
+// CHECK: store ptr [[TMP3]]{{.*}}
+// CHECK-NEXT: {{.*}}call{{.*}}__kmpc_omp_task_alloc{{.*}}
+// CHECK: store ptr [[TMP0]]{{.*}}
+// CHECK: store ptr [[TMP1]]{{.*}}
+// CHECK: store ptr [[TMP2]]{{.*}}
+// CHECK: store ptr [[TMP3]]{{.*}}
+// CHECK-NEXT: {{.*}}call{{.*}}__kmpc_omp_task_alloc{{.*}}
+// CHECK: ret void
|
…de in test to restore Ubuntu build. This is not needed as allocatable modifier is not applicable to the default clause in C/C++.
SunilKuravinakop
force-pushed
the
patch_fix_variable_category
branch
from
da1b836 to
aef0bf4
Compare
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/11/builds/28076 Here is the relevant piece of the build log for the reference |
Contributor
|
@SunilKuravinakop -- Starting to see the same failures reported by build bot on our toolchain builders at Google: |
Contributor
|
@chichunchen @SunilKuravinakop -- please fix forward or consider reverting. Let me know if we can do anything from our end to help you root cause the issue. |
Contributor
|
Just reverted it. |
Prabhuk
added a commit
that referenced
this pull request
Nov 14, 2025
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Nov 14, 2025
…tegory" (#168130) Reverts llvm/llvm-project#168112
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Same changes as in fix for 165276 except for remove unnecessary include in test to restore Ubuntu build.
This is not needed as allocatable modifier is not applicable to the default clause in C/C++.