Skip to content

Commit 0869204

Browse files
owencaowenca
committed
[clang-format] Fix buildbot failures
This effectively reverts 5cd2804 and changes to QualifierFixerTest.cpp from e62ce1f. Failed buidbots: https://lab.llvm.org/buildbot/#/builders/236/builds/11223 https://lab.llvm.org/buildbot/#/builders/239/builds/6968
1 parent 91c917b commit 0869204

File tree

3 files changed

+52
-62
lines changed

3 files changed

+52
-62
lines changed

‎clang/lib/Format/QualifierAlignmentFixer.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight(
281281

282282
const FormatToken *LastSimpleTypeSpecifier = TypeToken;
283283
while (isQualifierOrType(LastSimpleTypeSpecifier->getNextNonComment(),
284-
LangOpts)) {
284+
&LangOpts)) {
285285
LastSimpleTypeSpecifier = LastSimpleTypeSpecifier->getNextNonComment();
286286
}
287287

@@ -414,7 +414,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft(
414414
const FormatToken *LastSimpleTypeSpecifier = TypeToken;
415415
while (isConfiguredQualifierOrType(
416416
LastSimpleTypeSpecifier->getPreviousNonComment(),
417-
ConfiguredQualifierTokens, LangOpts)) {
417+
ConfiguredQualifierTokens, &LangOpts)) {
418418
LastSimpleTypeSpecifier =
419419
LastSimpleTypeSpecifier->getPreviousNonComment();
420420
}
@@ -613,16 +613,18 @@ void prepareLeftRightOrderingForQualifierAlignmentFixer(
613613
}
614614

615615
bool LeftRightQualifierAlignmentFixer::isQualifierOrType(
616-
const FormatToken *Tok, const LangOptions &LangOpts) {
617-
return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) ||
618-
isQualifier(Tok));
616+
const FormatToken *Tok, const LangOptions *LangOpts) {
617+
return Tok &&
618+
(Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) ||
619+
Tok->is(tok::kw_auto) || isQualifier(Tok));
619620
}
620621

621622
bool LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
622623
const FormatToken *Tok, const std::vector<tok::TokenKind> &Qualifiers,
623-
const LangOptions &LangOpts) {
624-
return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) ||
625-
isConfiguredQualifier(Tok, Qualifiers));
624+
const LangOptions *LangOpts) {
625+
return Tok &&
626+
(Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) ||
627+
Tok->is(tok::kw_auto) || isConfiguredQualifier(Tok, Qualifiers));
626628
}
627629

628630
// If a token is an identifier and it's upper case, it could

‎clang/lib/Format/QualifierAlignmentFixer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ class LeftRightQualifierAlignmentFixer : public TokenAnalyzer {
7272

7373
// Is the Token a simple or qualifier type
7474
static bool isQualifierOrType(const FormatToken *Tok,
75-
const LangOptions &LangOpts);
75+
const LangOptions *LangOpts = nullptr);
7676
static bool
7777
isConfiguredQualifierOrType(const FormatToken *Tok,
7878
const std::vector<tok::TokenKind> &Qualifiers,
79-
const LangOptions &LangOpts);
79+
const LangOptions *LangOpts = nullptr);
8080

8181
// Is the Token likely a Macro
8282
static bool isPossibleMacro(const FormatToken *Tok);

‎clang/unittests/Format/QualifierFixerTest.cpp

Lines changed: 40 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,82 +1055,70 @@ TEST_F(QualifierFixerTest, IsQualifierType) {
10551055
ConfiguredTokens.push_back(tok::kw_constexpr);
10561056
ConfiguredTokens.push_back(tok::kw_friend);
10571057

1058-
LangOptions LangOpts{getFormattingLangOpts()};
1059-
10601058
auto Tokens = annotate(
10611059
"const static inline auto restrict int double long constexpr friend");
10621060
ASSERT_EQ(Tokens.size(), 11u) << Tokens;
10631061

10641062
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1065-
Tokens[0], ConfiguredTokens, LangOpts));
1063+
Tokens[0], ConfiguredTokens));
10661064
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1067-
Tokens[1], ConfiguredTokens, LangOpts));
1065+
Tokens[1], ConfiguredTokens));
10681066
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1069-
Tokens[2], ConfiguredTokens, LangOpts));
1067+
Tokens[2], ConfiguredTokens));
10701068
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1071-
Tokens[3], ConfiguredTokens, LangOpts));
1069+
Tokens[3], ConfiguredTokens));
10721070
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1073-
Tokens[4], ConfiguredTokens, LangOpts));
1071+
Tokens[4], ConfiguredTokens));
10741072
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1075-
Tokens[5], ConfiguredTokens, LangOpts));
1073+
Tokens[5], ConfiguredTokens));
10761074
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1077-
Tokens[6], ConfiguredTokens, LangOpts));
1075+
Tokens[6], ConfiguredTokens));
10781076
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1079-
Tokens[7], ConfiguredTokens, LangOpts));
1077+
Tokens[7], ConfiguredTokens));
10801078
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1081-
Tokens[8], ConfiguredTokens, LangOpts));
1079+
Tokens[8], ConfiguredTokens));
10821080
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1083-
Tokens[9], ConfiguredTokens, LangOpts));
1084-
1085-
EXPECT_TRUE(
1086-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[0], LangOpts));
1087-
EXPECT_TRUE(
1088-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[1], LangOpts));
1089-
EXPECT_TRUE(
1090-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[2], LangOpts));
1091-
EXPECT_TRUE(
1092-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[3], LangOpts));
1093-
EXPECT_TRUE(
1094-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[4], LangOpts));
1095-
EXPECT_TRUE(
1096-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[5], LangOpts));
1097-
EXPECT_TRUE(
1098-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[6], LangOpts));
1099-
EXPECT_TRUE(
1100-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[7], LangOpts));
1101-
EXPECT_TRUE(
1102-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[8], LangOpts));
1103-
EXPECT_TRUE(
1104-
LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[9], LangOpts));
1081+
Tokens[9], ConfiguredTokens));
1082+
1083+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[0]));
1084+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[1]));
1085+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[2]));
1086+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[3]));
1087+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[4]));
1088+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[5]));
1089+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[6]));
1090+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[7]));
1091+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[8]));
1092+
EXPECT_TRUE(LeftRightQualifierAlignmentFixer::isQualifierOrType(Tokens[9]));
11051093

11061094
auto NotTokens = annotate("for while do Foo Bar ");
11071095
ASSERT_EQ(NotTokens.size(), 6u) << Tokens;
11081096

11091097
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1110-
NotTokens[0], ConfiguredTokens, LangOpts));
1098+
NotTokens[0], ConfiguredTokens));
11111099
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1112-
NotTokens[1], ConfiguredTokens, LangOpts));
1100+
NotTokens[1], ConfiguredTokens));
11131101
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1114-
NotTokens[2], ConfiguredTokens, LangOpts));
1102+
NotTokens[2], ConfiguredTokens));
11151103
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1116-
NotTokens[3], ConfiguredTokens, LangOpts));
1104+
NotTokens[3], ConfiguredTokens));
11171105
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1118-
NotTokens[4], ConfiguredTokens, LangOpts));
1106+
NotTokens[4], ConfiguredTokens));
11191107
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType(
1120-
NotTokens[5], ConfiguredTokens, LangOpts));
1121-
1122-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[0],
1123-
LangOpts));
1124-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[1],
1125-
LangOpts));
1126-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[2],
1127-
LangOpts));
1128-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[3],
1129-
LangOpts));
1130-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[4],
1131-
LangOpts));
1132-
EXPECT_FALSE(LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[5],
1133-
LangOpts));
1108+
NotTokens[5], ConfiguredTokens));
1109+
1110+
EXPECT_FALSE(
1111+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[0]));
1112+
EXPECT_FALSE(
1113+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[1]));
1114+
EXPECT_FALSE(
1115+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[2]));
1116+
EXPECT_FALSE(
1117+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[3]));
1118+
EXPECT_FALSE(
1119+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[4]));
1120+
EXPECT_FALSE(
1121+
LeftRightQualifierAlignmentFixer::isQualifierOrType(NotTokens[5]));
11341122
}
11351123

11361124
TEST_F(QualifierFixerTest, IsMacro) {

0 commit comments

Comments
 (0)