Skip to content

[clang][Tooling] Fix getFileRange returning a range spanning macro invocation #169842

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 1 commit into from
Nov 28, 2025
Merged

[clang][Tooling] Fix getFileRange returning a range spanning macro invocation #169842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 1 addition & 6 deletions clang/lib/Tooling/Transformer/SourceCode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,7 @@ static bool spelledInMacroDefinition(CharSourceRange Range,
return B.isInvalid() || B != E;
}

if (Range.getBegin().isMacroID())
return getMacroArgumentSpellingLoc(Range.getBegin(), SM).isInvalid();
if (Range.getEnd().isMacroID())
return getMacroArgumentSpellingLoc(Range.getEnd(), SM).isInvalid();

return false;
return Range.getBegin().isMacroID() || Range.getEnd().isMacroID();
}

// Returns the expansion char-range of `Loc` if `Loc` is a split token. For
Expand Down
2 changes: 2 additions & 0 deletions clang/unittests/Tooling/SourceCodeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,11 +511,13 @@ TEST(SourceCodeTest, EditInvolvingExpansionIgnoringExpansionShouldFail) {
#define M2(x, y) x ## y
#define M3(x) foobar(x)
#define M4(x, y) x y
#define M5(x) x
int foobar(int);
int a = M1(foobar);
int b = M2(foo, bar(2));
int c = M3(3);
int d = M4(foobar, (4));
int e = M5(foobar) (5);
)cpp");

CallsVisitor Visitor;
Expand Down