Author: abataev
Date: Tue Nov 14 13:01:01 2017
New Revision: 318194
URL: http://llvm.org/viewvc/llvm-project?rev=318194&view=rev
Log:
[OPENMP] Fix DSA analysis for threadprivates after deserialization.
If threadprivate vaible is deserialized, it is not marked as
threadprivate in DSAStack.
Modified:
cfe/trunk/lib/Sema/SemaOpenMP.cpp
cfe/trunk/test/OpenMP/parallel_ast_print.cpp
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=318194&r1=318193&r2=318194&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Tue Nov 14 13:01:01 2017
@@ -966,6 +966,12 @@ DSAStackTy::DSAVarData DSAStackTy::getTo
DVar.RefExpr = TI->getSecond().RefExpr.getPointer();
DVar.CKind = OMPC_threadprivate;
return DVar;
+ } else if (VD && VD->hasAttr<OMPThreadPrivateDeclAttr>()) {
+ DVar.RefExpr = buildDeclRefExpr(
+ SemaRef, VD, D->getType().getNonReferenceType(),
+ VD->getAttr<OMPThreadPrivateDeclAttr>()->getLocation());
+ DVar.CKind = OMPC_threadprivate;
+ addDSA(D, DVar.RefExpr, OMPC_threadprivate);
}
if (isStackEmpty())
Modified: cfe/trunk/test/OpenMP/parallel_ast_print.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/parallel_ast_print.cpp?rev=318194&r1=318193&r2=318194&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/parallel_ast_print.cpp (original)
+++ cfe/trunk/test/OpenMP/parallel_ast_print.cpp Tue Nov 14 13:01:01 2017
@@ -135,6 +135,9 @@ struct S {
// CHECK-NEXT: #pragma omp threadprivate(S<long>::TS)
// CHECK-NEXT: }
+int thrp;
+#pragma omp threadprivate(thrp)
+
template <typename T, int C>
T tmain(T argc, T *argv) {
T b = argc, c, d, e, f, g;
@@ -143,7 +146,7 @@ T tmain(T argc, T *argv) {
T arr[C][10], arr1[C];
#pragma omp parallel
a=2;
-#pragma omp parallel default(none), private(argc,b) firstprivate(argv) shared
(d) if (parallel:argc > 0) num_threads(C) copyin(S<T>::TS) proc_bind(master)
reduction(+:c, arr1[argc]) reduction(max:e, arr[:C][0:10])
+#pragma omp parallel default(none), private(argc,b) firstprivate(argv) shared
(d) if (parallel:argc > 0) num_threads(C) copyin(S<T>::TS, thrp)
proc_bind(master) reduction(+:c, arr1[argc]) reduction(max:e, arr[:C][0:10])
foo();
#pragma omp parallel if (C) num_threads(s) proc_bind(close) reduction(^:e, f,
arr[0:C][:argc]) reduction(&& : g)
foo();
@@ -157,7 +160,7 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: T arr[C][10], arr1[C];
// CHECK-NEXT: #pragma omp parallel
// CHECK-NEXT: a = 2;
-// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(C)
copyin(S<T>::TS) proc_bind(master) reduction(+: c,arr1[argc]) reduction(max:
e,arr[:C][0:10])
+// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(C)
copyin(S<T>::TS,thrp) proc_bind(master) reduction(+: c,arr1[argc])
reduction(max: e,arr[:C][0:10])
// CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp parallel if(C) num_threads(s) proc_bind(close)
reduction(^: e,f,arr[0:C][:argc]) reduction(&&: g)
// CHECK-NEXT: foo()
@@ -168,7 +171,7 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: int arr[5][10], arr1[5];
// CHECK-NEXT: #pragma omp parallel
// CHECK-NEXT: a = 2;
-// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(5)
copyin(S<int>::TS) proc_bind(master) reduction(+: c,arr1[argc]) reduction(max:
e,arr[:5][0:10])
+// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(5)
copyin(S<int>::TS,thrp) proc_bind(master) reduction(+: c,arr1[argc])
reduction(max: e,arr[:5][0:10])
// CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp parallel if(5) num_threads(s) proc_bind(close)
reduction(^: e,f,arr[0:5][:argc]) reduction(&&: g)
// CHECK-NEXT: foo()
@@ -179,7 +182,7 @@ T tmain(T argc, T *argv) {
// CHECK-NEXT: long arr[1][10], arr1[1];
// CHECK-NEXT: #pragma omp parallel
// CHECK-NEXT: a = 2;
-// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(1)
copyin(S<long>::TS) proc_bind(master) reduction(+: c,arr1[argc]) reduction(max:
e,arr[:1][0:10])
+// CHECK-NEXT: #pragma omp parallel default(none) private(argc,b)
firstprivate(argv) shared(d) if(parallel: argc > 0) num_threads(1)
copyin(S<long>::TS,thrp) proc_bind(master) reduction(+: c,arr1[argc])
reduction(max: e,arr[:1][0:10])
// CHECK-NEXT: foo()
// CHECK-NEXT: #pragma omp parallel if(1) num_threads(s) proc_bind(close)
reduction(^: e,f,arr[0:1][:argc]) reduction(&&: g)
// CHECK-NEXT: foo()
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
