diff options
author | Owen Pan <owenpiano@gmail.com> | 2024-05-12 17:23:19 -0700 |
---|---|---|
committer | Owen Pan <owenpiano@gmail.com> | 2024-05-12 18:35:35 -0700 |
commit | 626025ac7796b70cde9fc0fd4f688c3441949d04 (patch) | |
tree | 9a30dc419d8e1256f35b3dac786a9180727db2dc /clang/lib/Format/QualifierAlignmentFixer.cpp | |
parent | 5bde8017a1109128d011510dcf4ba79140a224fe (diff) | |
download | llvm-626025ac7796b70cde9fc0fd4f688c3441949d04.zip llvm-626025ac7796b70cde9fc0fd4f688c3441949d04.tar.gz llvm-626025ac7796b70cde9fc0fd4f688c3441949d04.tar.bz2 |
Revert "[clang-format] Fix buildbot failures"
This reverts commit 0869204cff22831d0bb19a82c99bf85e4deb4ae3, which caused a
buildbot failure:
https://lab.llvm.org/buildbot/#/builders/5/builds/43322
Diffstat (limited to 'clang/lib/Format/QualifierAlignmentFixer.cpp')
-rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 077ce5e..a904f0b 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -281,7 +281,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight( const FormatToken *LastSimpleTypeSpecifier = TypeToken; while (isQualifierOrType(LastSimpleTypeSpecifier->getNextNonComment(), - &LangOpts)) { + LangOpts)) { LastSimpleTypeSpecifier = LastSimpleTypeSpecifier->getNextNonComment(); } @@ -414,7 +414,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft( const FormatToken *LastSimpleTypeSpecifier = TypeToken; while (isConfiguredQualifierOrType( LastSimpleTypeSpecifier->getPreviousNonComment(), - ConfiguredQualifierTokens, &LangOpts)) { + ConfiguredQualifierTokens, LangOpts)) { LastSimpleTypeSpecifier = LastSimpleTypeSpecifier->getPreviousNonComment(); } @@ -613,18 +613,16 @@ void prepareLeftRightOrderingForQualifierAlignmentFixer( } bool LeftRightQualifierAlignmentFixer::isQualifierOrType( - const FormatToken *Tok, const LangOptions *LangOpts) { - return Tok && - (Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) || - Tok->is(tok::kw_auto) || isQualifier(Tok)); + const FormatToken *Tok, const LangOptions &LangOpts) { + return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) || + isQualifier(Tok)); } bool LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType( const FormatToken *Tok, const std::vector<tok::TokenKind> &Qualifiers, - const LangOptions *LangOpts) { - return Tok && - (Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) || - Tok->is(tok::kw_auto) || isConfiguredQualifier(Tok, Qualifiers)); + const LangOptions &LangOpts) { + return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) || + isConfiguredQualifier(Tok, Qualifiers)); } // If a token is an identifier and it's upper case, it could |