From 4f161cf1c2cad898740f2ba23ba64042ec590b5d Mon Sep 17 00:00:00 2001 From: Kelvin Li Date: Wed, 20 Jul 2016 19:41:17 +0000 Subject: [PATCH] [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 llvm-svn: 276167 --- clang/lib/Sema/SemaOpenMP.cpp | 4 ++-- clang/test/OpenMP/atomic_messages.c | 4 ++++ clang/test/OpenMP/atomic_messages.cpp | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index 3f9c35c..d55d6ec 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/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( 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/clang/test/OpenMP/atomic_messages.c b/clang/test/OpenMP/atomic_messages.c index 8182465..7b3178b 100644 --- a/clang/test/OpenMP/atomic_messages.c +++ b/clang/test/OpenMP/atomic_messages.c @@ -313,6 +313,8 @@ int captureint() { #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 {c = a;a--;} @@ -321,6 +323,8 @@ int captureint() { #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 {c = a; a *= b;} diff --git a/clang/test/OpenMP/atomic_messages.cpp b/clang/test/OpenMP/atomic_messages.cpp index 7f78ad4..efb368d 100644 --- a/clang/test/OpenMP/atomic_messages.cpp +++ b/clang/test/OpenMP/atomic_messages.cpp @@ -453,6 +453,8 @@ T capture() { #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 {c = a;a--;} @@ -461,6 +463,8 @@ T capture() { #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 {c = a; a *= b;} -- 2.7.4