This revision was automatically updated to reflect the committed changes. Closed by commit rL276167: [OpenMP] Ignore parens in atomic capture (authored by kli).
Changed prior to commit: https://reviews.llvm.org/D22487?vs=64416&id=64732#toc Repository: rL LLVM https://reviews.llvm.org/D22487 Files: cfe/trunk/lib/Sema/SemaOpenMP.cpp cfe/trunk/test/OpenMP/atomic_messages.c cfe/trunk/test/OpenMP/atomic_messages.cpp Index: cfe/trunk/test/OpenMP/atomic_messages.cpp =================================================================== --- cfe/trunk/test/OpenMP/atomic_messages.cpp +++ cfe/trunk/test/OpenMP/atomic_messages.cpp @@ -453,14 +453,18 @@ #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--;} #pragma omp atomic 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 {c = a; a *= b;} Index: cfe/trunk/test/OpenMP/atomic_messages.c =================================================================== --- cfe/trunk/test/OpenMP/atomic_messages.c +++ cfe/trunk/test/OpenMP/atomic_messages.c @@ -313,14 +313,18 @@ #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--;} #pragma omp atomic 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 {c = a; a *= b;} Index: cfe/trunk/lib/Sema/SemaOpenMP.cpp =================================================================== --- cfe/trunk/lib/Sema/SemaOpenMP.cpp +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp @@ -6163,7 +6163,7 @@ 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 @@ 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 {
Index: cfe/trunk/test/OpenMP/atomic_messages.cpp =================================================================== --- cfe/trunk/test/OpenMP/atomic_messages.cpp +++ cfe/trunk/test/OpenMP/atomic_messages.cpp @@ -453,14 +453,18 @@ #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--;} #pragma omp atomic 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 {c = a; a *= b;} Index: cfe/trunk/test/OpenMP/atomic_messages.c =================================================================== --- cfe/trunk/test/OpenMP/atomic_messages.c +++ cfe/trunk/test/OpenMP/atomic_messages.c @@ -313,14 +313,18 @@ #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--;} #pragma omp atomic 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 {c = a; a *= b;} Index: cfe/trunk/lib/Sema/SemaOpenMP.cpp =================================================================== --- cfe/trunk/lib/Sema/SemaOpenMP.cpp +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp @@ -6163,7 +6163,7 @@ 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 @@ 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 {
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits