Skip to content

[Clang][ASTMatcher] Improve matching isDerivedFrom base in case of multi aliases exists #126793

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 3 commits into from
Mar 5, 2025
Merged

[Clang][ASTMatcher] Improve matching isDerivedFrom base in case of multi aliases exists #126793

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfa6bfb
[Clang][ASTMatcher] Improve matching isDerivedFrom base in case of mu…
AmrDeveloper Feb 11, 2025
08d0a78
Add a releasenote
AmrDeveloper Mar 5, 2025
3fe08df
Update releasenote
AmrDeveloper Mar 5, 2025
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
2 changes: 2 additions & 0 deletions clang/docs/ReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ Fixed Point Support in Clang
AST Matchers
------------

- Ensure ``isDerivedFrom`` is matching the correct base in case of more than one aliases exists.
Copy link
Collaborator

@AaronBallman AaronBallman Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Ensure ``isDerivedFrom`` is matching the correct base in case of more than one aliases exists.
- Ensure ``isDerivedFrom`` matches the correct base in case more than one alias exists.

Minor rewording


clang-format
------------

Expand Down
21 changes: 21 additions & 0 deletions clang/lib/ASTMatchers/ASTMatchFinder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,6 +1287,27 @@ class MatchASTVisitor : public RecursiveASTVisitor<MatchASTVisitor>,
auto Aliases = TypeAliases.find(CanonicalType);
if (Aliases == TypeAliases.end())
return false;

if (const auto *ElaboratedTypeNode =
llvm::dyn_cast<ElaboratedType>(TypeNode)) {
if (ElaboratedTypeNode->isSugared() && Aliases->second.size() > 1) {
const auto &DesugaredTypeName =
ElaboratedTypeNode->desugar().getAsString();

for (const TypedefNameDecl *Alias : Aliases->second) {
if (Alias->getName() != DesugaredTypeName) {
continue;
}

BoundNodesTreeBuilder Result(*Builder);
if (Matcher.matches(*Alias, this, &Result)) {
*Builder = std::move(Result);
return true;
}
}
}
}

for (const TypedefNameDecl *Alias : Aliases->second) {
BoundNodesTreeBuilder Result(*Builder);
if (Matcher.matches(*Alias, this, &Result)) {
Expand Down
17 changes: 17 additions & 0 deletions clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,23 @@ TEST_P(ASTMatchersTest, IsDerivedFrom_EmptyName) {
EXPECT_TRUE(notMatches(Code, cxxRecordDecl(isSameOrDerivedFrom(""))));
}

TEST_P(ASTMatchersTest, IsDerivedFrom_ElaboratedType) {
if (!GetParam().isCXX()) {
return;
}

DeclarationMatcher IsDerivenFromBase =
cxxRecordDecl(isDerivedFrom(decl().bind("typedef")));

EXPECT_TRUE(matchAndVerifyResultTrue(
"struct AnInterface {};"
"typedef AnInterface UnusedTypedef;"
"typedef AnInterface Base;"
"class AClass : public Base {};",
IsDerivenFromBase,
std::make_unique<VerifyIdIsBoundTo<TypedefDecl>>("typedef", "Base")));
}

TEST_P(ASTMatchersTest, IsDerivedFrom_ObjC) {
DeclarationMatcher IsDerivedFromX = objcInterfaceDecl(isDerivedFrom("X"));
EXPECT_TRUE(
Expand Down