[OpenMP] Ignore parens in atomic capture

Clang misdiagnoses atomic captures cases that contains parens.
i.e.

  int v, int *p;
#pragma omp atomic capture
{ v = (*p); (*p)++; }

Patch by David S.

Differential Revision: https://reviews.llvm.org/D22487

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@276167 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp
index 3f9c35c508b57f9b01aef01a0daf018bc8a4d07a..d55d6ecc79a813554da771c28c81407eded29028 100644 (file)
--- a/lib/Sema/SemaOpenMP.cpp
+++ b/lib/Sema/SemaOpenMP.cpp
@@ -6163,7 +6163,7 @@ bool OpenMPAtomicUpdateChecker::checkStatement(Stmt *S, unsigned DiagId,
             AtomicCompAssignOp->getOpcode());
         OpLoc = AtomicCompAssignOp->getOperatorLoc();
         E = AtomicCompAssignOp->getRHS();
-        X = AtomicCompAssignOp->getLHS();
+        X = AtomicCompAssignOp->getLHS()->IgnoreParens();
         IsXLHSInRHSPart = true;
       } else if (auto *AtomicBinOp = dyn_cast<BinaryOperator>(
                      AtomicBody->IgnoreParenImpCasts())) {
@@ -6177,7 +6177,7 @@ bool OpenMPAtomicUpdateChecker::checkStatement(Stmt *S, unsigned DiagId,
           IsPostfixUpdate = AtomicUnaryOp->isPostfix();
           Op = AtomicUnaryOp->isIncrementOp() ? BO_Add : BO_Sub;
           OpLoc = AtomicUnaryOp->getOperatorLoc();
-          X = AtomicUnaryOp->getSubExpr();
+          X = AtomicUnaryOp->getSubExpr()->IgnoreParens();
           E = SemaRef.ActOnIntegerConstant(OpLoc, /*uint64_t Val=*/1).get();
           IsXLHSInRHSPart = true;
         } else {

diff --git a/test/OpenMP/atomic_messages.c b/test/OpenMP/atomic_messages.c
index 8182465494ba88923b93244b50a61776adedb424..7b3178bba49f7c96dbb6a5a60f1fa451873d4888 100644 (file)
--- a/test/OpenMP/atomic_messages.c
+++ b/test/OpenMP/atomic_messages.c
@@ -312,6 +312,8 @@ int captureint() {
   { *&a = *&a +  2; c = *&a;}
 #pragma omp atomic capture
   {c = a; a++;}
+#pragma omp atomic capture
+  {c = a; (a)++;}
 #pragma omp atomic capture
   {++a;c = a;}
 #pragma omp atomic capture
@@ -320,6 +322,8 @@ int captureint() {
   {--a;c = a;}
 #pragma omp atomic capture
   {c = a; a += b;}
+#pragma omp atomic capture
+  {c = a; (a) += b;}
 #pragma omp atomic capture
   {a %= b; c = a;}
 #pragma omp atomic capture

diff --git a/test/OpenMP/atomic_messages.cpp b/test/OpenMP/atomic_messages.cpp
index 7f78ad443da67e9b676f7c944072125ec0530414..efb368d1a7c0e1db11c5e09a853abce03b052972 100644 (file)
--- a/test/OpenMP/atomic_messages.cpp
+++ b/test/OpenMP/atomic_messages.cpp
@@ -452,6 +452,8 @@ T capture() {
   { *&a = *&a +  2; c = *&a;}
 #pragma omp atomic capture
   {c = a; a++;}
+#pragma omp atomic capture
+  {c = a; (a)++;}
 #pragma omp atomic capture
   {++a;c = a;}
 #pragma omp atomic capture
@@ -460,6 +462,8 @@ T capture() {
   {--a;c = a;}
 #pragma omp atomic capture
   {c = a; a += b;}
+#pragma omp atomic capture
+  {c = a; (a) += b;}
 #pragma omp atomic capture
   {a %= b; c = a;}
 #pragma omp atomic capture