Skip to content

Commit cfe1df3

Browse files
author
urvi-rav
committed
formatting changes
1 parent ce8572c commit cfe1df3

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

clang/lib/Parse/ParseOpenMP.cpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,32 +2960,34 @@ OMPClause *Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
29602960
SmallVector<SemaOpenMP::UsesAllocatorsData, 4> Data;
29612961
do {
29622962
// Parse 'traits(expr) : Allocator' for >=5.2
2963-
if (getLangOpts().OpenMP >= 52 &&
2964-
Tok.is(tok::identifier) &&
2963+
if (getLangOpts().OpenMP >= 52 && Tok.is(tok::identifier) &&
29652964
Tok.getIdentifierInfo()->getName() == "traits") {
29662965

29672966
SemaOpenMP::UsesAllocatorsData &D = Data.emplace_back();
29682967

29692968
ConsumeToken();
29702969

29712970
// Parse '(' <expr> ')'
2972-
BalancedDelimiterTracker TraitParens(*this, tok::l_paren, tok::annot_pragma_openmp_end);
2971+
BalancedDelimiterTracker TraitParens(*this, tok::l_paren,
2972+
tok::annot_pragma_openmp_end);
29732973
TraitParens.consumeOpen();
29742974
ExprResult AllocatorTraits =
29752975
getLangOpts().CPlusPlus ? ParseCXXIdExpression() : ParseExpression();
29762976
TraitParens.consumeClose();
29772977

29782978
if (AllocatorTraits.isInvalid()) {
2979-
SkipUntil({tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
2980-
StopBeforeMatch);
2979+
SkipUntil(
2980+
{tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
2981+
StopBeforeMatch);
29812982
break;
29822983
}
29832984

29842985
// Expect ':'
29852986
if (Tok.isNot(tok::colon)) {
29862987
Diag(Tok, diag::err_expected) << tok::colon;
2987-
SkipUntil({tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
2988-
StopBeforeMatch);
2988+
SkipUntil(
2989+
{tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
2990+
StopBeforeMatch);
29892991
continue;
29902992
}
29912993
ConsumeToken();
@@ -2995,11 +2997,13 @@ OMPClause *Parser::ParseOpenMPUsesAllocatorClause(OpenMPDirectiveKind DKind) {
29952997
ExprResult AllocatorExpr =
29962998
getLangOpts().CPlusPlus
29972999
? ParseCXXIdExpression()
2998-
: tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false, Replacement);
3000+
: tryParseCXXIdExpression(SS, /*isAddressOfOperand=*/false,
3001+
Replacement);
29993002

30003003
if (AllocatorExpr.isInvalid()) {
3001-
SkipUntil({tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
3002-
StopBeforeMatch);
3004+
SkipUntil(
3005+
{tok::comma, tok::semi, tok::r_paren, tok::annot_pragma_openmp_end},
3006+
StopBeforeMatch);
30033007
break;
30043008
}
30053009

clang/lib/Sema/SemaOpenMP.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24084,12 +24084,12 @@ OMPClause *SemaOpenMP::ActOnOpenMPUsesAllocatorClause(
2408424084
// Non-predefined allocators appearing in a uses_allocators clause must
2408524085
// have traits specified.
2408624086
if (getLangOpts().OpenMP < 52) {
24087-
if (!IsPredefinedAllocator && !D.AllocatorTraits) {
24088-
Diag(D.Allocator->getExprLoc(),
24089-
diag::err_omp_nonpredefined_allocator_without_traits);
24090-
continue;
24087+
if (!IsPredefinedAllocator && !D.AllocatorTraits) {
24088+
Diag(D.Allocator->getExprLoc(),
24089+
diag::err_omp_nonpredefined_allocator_without_traits);
24090+
continue;
24091+
}
2409124092
}
24092-
}
2409324093
// No allocator traits - just convert it to rvalue.
2409424094
if (!D.AllocatorTraits)
2409524095
AllocatorExpr = SemaRef.DefaultLvalueConversion(AllocatorExpr).get();

0 commit comments

Comments
 (0)