Skip to content

[clang][dataflow] Fix smart pointer accessor caching to handle aliases #124964

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
Jan 30, 2025
Merged

[clang][dataflow] Fix smart pointer accessor caching to handle aliases #124964

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
19 changes: 11 additions & 8 deletions clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using ast_matchers::callee;
using ast_matchers::cxxMemberCallExpr;
using ast_matchers::cxxMethodDecl;
using ast_matchers::cxxOperatorCallExpr;
using ast_matchers::hasCanonicalType;
using ast_matchers::hasName;
using ast_matchers::hasOverloadedOperatorName;
using ast_matchers::ofClass;
Expand Down Expand Up @@ -122,27 +123,29 @@ namespace clang::dataflow {
ast_matchers::StatementMatcher isSmartPointerLikeOperatorStar() {
return cxxOperatorCallExpr(
hasOverloadedOperatorName("*"),
callee(cxxMethodDecl(parameterCountIs(0), returns(referenceType()),
callee(cxxMethodDecl(parameterCountIs(0),
returns(hasCanonicalType(referenceType())),
ofClass(smartPointerClassWithGetOrValue()))));
}

ast_matchers::StatementMatcher isSmartPointerLikeOperatorArrow() {
return cxxOperatorCallExpr(
hasOverloadedOperatorName("->"),
callee(cxxMethodDecl(parameterCountIs(0), returns(pointerType()),
callee(cxxMethodDecl(parameterCountIs(0),
returns(hasCanonicalType(pointerType())),
ofClass(smartPointerClassWithGetOrValue()))));
}

ast_matchers::StatementMatcher isSmartPointerLikeValueMethodCall() {
return cxxMemberCallExpr(callee(
cxxMethodDecl(parameterCountIs(0), returns(referenceType()),
hasName("value"), ofClass(smartPointerClassWithValue()))));
return cxxMemberCallExpr(callee(cxxMethodDecl(
parameterCountIs(0), returns(hasCanonicalType(referenceType())),
hasName("value"), ofClass(smartPointerClassWithValue()))));
}

ast_matchers::StatementMatcher isSmartPointerLikeGetMethodCall() {
return cxxMemberCallExpr(callee(
cxxMethodDecl(parameterCountIs(0), returns(pointerType()), hasName("get"),
ofClass(smartPointerClassWithGet()))));
return cxxMemberCallExpr(callee(cxxMethodDecl(
parameterCountIs(0), returns(hasCanonicalType(pointerType())),
hasName("get"), ofClass(smartPointerClassWithGet()))));
}

const FunctionDecl *
Expand Down
52 changes: 52 additions & 0 deletions clang/unittests/Analysis/FlowSensitive/SmartPointerAccessorCachingTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,57 @@ TEST(SmartPointerAccessorCachingTest, MatchesWithValueAndNonConstOverloads) {
isSmartPointerLikeValueMethodCall()));
}

TEST(SmartPointerAccessorCachingTest, MatchesWithTypeAliases) {
llvm::StringRef Decls(R"cc(
template <class T>
struct HasGetAndValue {
using pointer_t = T*;
using reference_t = T&;

const pointer_t operator->() const;
pointer_t operator->();
const reference_t operator*() const;
reference_t operator*();
const reference_t value() const;
reference_t value();
const pointer_t get() const;
pointer_t get();
};

struct S { int i; };
)cc");

EXPECT_TRUE(matches(
Decls,
"int target(HasGetAndValue<S> &NonConst) { return (*NonConst).i; }",
isSmartPointerLikeOperatorStar()));
EXPECT_TRUE(matches(
Decls,
"int target(const HasGetAndValue<S> &Const) { return (*Const).i; }",
isSmartPointerLikeOperatorStar()));
EXPECT_TRUE(matches(
Decls, "int target(HasGetAndValue<S> &NonConst) { return NonConst->i; }",
isSmartPointerLikeOperatorArrow()));
EXPECT_TRUE(matches(
Decls, "int target(const HasGetAndValue<S> &Const) { return Const->i; }",
isSmartPointerLikeOperatorArrow()));
EXPECT_TRUE(matches(
Decls,
"int target(HasGetAndValue<S> &NonConst) { return NonConst.value().i; }",
isSmartPointerLikeValueMethodCall()));
EXPECT_TRUE(matches(
Decls,
"int target(const HasGetAndValue<S> &Const) { return Const.value().i; }",
isSmartPointerLikeValueMethodCall()));
EXPECT_TRUE(matches(
Decls,
"int target(HasGetAndValue<S> &NonConst) { return NonConst.get()->i; }",
isSmartPointerLikeGetMethodCall()));
EXPECT_TRUE(matches(
Decls,
"int target(const HasGetAndValue<S> &Const) { return Const.get()->i; }",
isSmartPointerLikeGetMethodCall()));
}

} // namespace
} // namespace clang::dataflow