Skip to content

[clang-format] Fix crashes when the macro expansion is empty #119428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 22, 2024
Merged

[clang-format] Fix crashes when the macro expansion is empty #119428

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a4c1a9
Fix crashes when the macro expansion is empty
amane-ame Dec 10, 2024
8bf68f8
[clang-format] Add a testcase for empty macro
amane-ame Dec 15, 2024
37a5b1b
[clang-format] Move the testcase to unittest
amane-ame Dec 16, 2024
e46f0e0
[clang-format] Fix about Tokens in MacroCallReconstructorTest
amane-ame Dec 19, 2024
6a390e3
[clang-format] Fix a comment
amane-ame Dec 21, 2024
bd0b6fa
[clang-format] Add a unittest for GH119258
amane-ame Dec 21, 2024
33d5b59
[clang-format] Change unittest name
amane-ame Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions clang/lib/Format/MacroExpander.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ MacroExpander::expand(FormatToken *ID,
if (Result.size() > 1) {
++Result[0]->MacroCtx->StartOfExpansion;
++Result[Result.size() - 2]->MacroCtx->EndOfExpansion;
} else {
// If the macro expansion is empty, mark the start and end.
Result[0]->MacroCtx->StartOfExpansion = 1;
Result[0]->MacroCtx->EndOfExpansion = 1;
}
return Result;
}
Expand Down
29 changes: 28 additions & 1 deletion clang/unittests/Format/MacroCallReconstructorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ class Expansion {
}
Unexpanded[ID] = std::move(UnexpandedLine);

auto Expanded = uneof(Macros.expand(ID, Args));
auto Expanded = Macros.expand(ID, Args);
if (Expanded.size() > 1)
Expanded = uneof(Expanded);
Tokens.append(Expanded.begin(), Expanded.end());

TokenList UnexpandedTokens;
Expand Down Expand Up @@ -217,6 +219,31 @@ TEST_F(MacroCallReconstructorTest, Identifier) {
EXPECT_THAT(std::move(Unexp).takeResult(), matchesLine(line(U.consume("X"))));
}

TEST_F(MacroCallReconstructorTest, IdentifierObject) {
auto Macros = createExpander({"X"});
Expansion Exp(Lex, *Macros);
TokenList Call = Exp.expand("X");

MacroCallReconstructor Unexp(0, Exp.getUnexpanded());
Unexp.addLine(line(Exp.getTokens()));
EXPECT_TRUE(Unexp.finished());
Matcher U(Call, Lex);
EXPECT_THAT(std::move(Unexp).takeResult(), matchesLine(line(U.consume("X"))));
}

TEST_F(MacroCallReconstructorTest, EmptyExpansion) {
auto Macros = createExpander({"A(x)=x"});
Expansion Exp(Lex, *Macros);
TokenList Call = Exp.expand("A", {""});

MacroCallReconstructor Unexp(0, Exp.getUnexpanded());
Unexp.addLine(line(Exp.getTokens()));
EXPECT_TRUE(Unexp.finished());
Matcher U(Call, Lex);
EXPECT_THAT(std::move(Unexp).takeResult(),
matchesLine(line(U.consume("A()"))));
}

TEST_F(MacroCallReconstructorTest, NestedLineWithinCall) {
auto Macros = createExpander({"C(a)=class X { a; };"});
Expansion Exp(Lex, *Macros);
Expand Down
Loading