[clang] [OpenMP 5.2] New syntax for 'uses_allocators' clause (PR #157025)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff origin/main HEAD --extensions cpp -- 
clang/lib/Parse/ParseOpenMP.cpp clang/lib/Sema/SemaOpenMP.cpp 
clang/test/OpenMP/target_uses_allocators_messages.cpp
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index 92abc7084..998c676c0 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -2960,8 +2960,7 @@ OMPClause 
*Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
   SmallVector<SemaOpenMP::UsesAllocatorsData, 4> Data;
   do {
     // Parse 'traits(expr) : Allocator' for >=5.2
-    if (getLangOpts().OpenMP >= 52 &&
-        Tok.is(tok::identifier) &&
+    if (getLangOpts().OpenMP >= 52 && Tok.is(tok::identifier) &&
         Tok.getIdentifierInfo()->getName() == "traits") {
 
       SemaOpenMP::UsesAllocatorsData &D = Data.emplace_back();
@@ -2969,23 +2968,26 @@ OMPClause 
*Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
       ConsumeToken();
 
       // Parse '(' <expr> ')'
-      BalancedDelimiterTracker TraitParens(*this, tok::l_paren, 
tok::annot_pragma_openmp_end);
+      BalancedDelimiterTracker TraitParens(*this, tok::l_paren,
+                                           tok::annot_pragma_openmp_end);
       TraitParens.consumeOpen();
       ExprResult AllocatorTraits =
           getLangOpts().CPlusPlus ? ParseCXXIdExpression() : ParseExpression();
       TraitParens.consumeClose();
 
       if (AllocatorTraits.isInvalid()) {
-        SkipUntil({tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
-                  StopBeforeMatch);
+        SkipUntil(
+            {tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
+            StopBeforeMatch);
         break;
       }
 
       // Expect ':'
       if (Tok.isNot(tok::colon)) {
         Diag(Tok, diag::err_expected) << tok::colon;
-        SkipUntil({tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
-                  StopBeforeMatch);
+        SkipUntil(
+            {tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
+            StopBeforeMatch);
         continue;
       }
       ConsumeToken();
@@ -2995,11 +2997,13 @@ OMPClause 
*Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
       ExprResult AllocatorExpr =
           getLangOpts().CPlusPlus
               ? ParseCXXIdExpression()
-              : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false, 
Replacement);
+              : tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false,
+                                        Replacement);
 
       if (AllocatorExpr.isInvalid()) {
-        SkipUntil({tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
-                  StopBeforeMatch);
+        SkipUntil(
+            {tok::comma, tok::semi, tok::r_paren, 
tok::annot_pragma_openmp_end},
+            StopBeforeMatch);
         break;
       }
 
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 7db5226da..8b87101c2 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -24084,12 +24084,12 @@ OMPClause *SemaOpenMP::ActOnOpenMPUsesAllocatorClause(
       // Non-predefined allocators appearing in a uses_allocators clause must
       // have traits specified.
       if (getLangOpts().OpenMP < 52) {
-      if (!IsPredefinedAllocator && !D.AllocatorTraits) {
-        Diag(D.Allocator->getExprLoc(),
-             diag::err_omp_nonpredefined_allocator_without_traits);
-        continue;
+        if (!IsPredefinedAllocator && !D.AllocatorTraits) {
+          Diag(D.Allocator->getExprLoc(),
+               diag::err_omp_nonpredefined_allocator_without_traits);
+          continue;
+        }
       }
-    }
       // No allocator traits - just convert it to rvalue.
       if (!D.AllocatorTraits)
         AllocatorExpr = SemaRef.DefaultLvalueConversion(AllocatorExpr).get();

``````````

</details>


https://github.com/llvm/llvm-project/pull/157025
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits