Skip to content

Revert "[clang][dataflow] Retrieve members from accessors called using member…" #74299

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
Dec 4, 2023
Merged

Revert "[clang][dataflow] Retrieve members from accessors called using member…" #74299

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: 2 additions & 5 deletions clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,9 @@ static void insertIfFunction(const Decl &D,
}

static MemberExpr *getMemberForAccessor(const CXXMemberCallExpr &C) {
// Use getCalleeDecl instead of getMethodDecl in order to handle
// pointer-to-member calls.
const auto *MethodDecl = dyn_cast_or_null<CXXMethodDecl>(C.getCalleeDecl());
if (!MethodDecl)
if (!C.getMethodDecl())
return nullptr;
auto *Body = dyn_cast_or_null<CompoundStmt>(MethodDecl->getBody());
auto *Body = dyn_cast_or_null<CompoundStmt>(C.getMethodDecl()->getBody());
if (!Body || Body->size() != 1)
return nullptr;
if (auto *RS = dyn_cast<ReturnStmt>(*Body->body_begin()))
Expand Down
51 changes: 0 additions & 51 deletions clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ namespace {
using namespace clang;
using namespace dataflow;
using ::clang::dataflow::test::getFieldValue;
using ::testing::Contains;
using ::testing::IsNull;
using ::testing::NotNull;

Expand Down Expand Up @@ -312,56 +311,6 @@ TEST_F(EnvironmentTest, InitGlobalVarsConstructor) {
EXPECT_THAT(Env.getValue(*Var), NotNull());
}

// Pointers to Members are a tricky case of accessor calls, complicated further
// when using templates where the pointer to the member is a template argument.
// This is a repro of a failure case seen in the wild.
TEST_F(EnvironmentTest,
ModelMemberForAccessorUsingMethodPointerThroughTemplate) {
using namespace ast_matchers;

std::string Code = R"cc(
struct S {
int accessor() {return member;}

int member = 0;
};

template <auto method>
int Target(S* S) {
return (S->*method)();
}

// We want to analyze the instantiation of Target for the accessor.
int Instantiator () {S S; return Target<&S::accessor>(&S); }
)cc";

auto Unit =
// C++17 for the simplifying use of auto in the template declaration.
tooling::buildASTFromCodeWithArgs(Code, {"-fsyntax-only", "-std=c++17"});
auto &Context = Unit->getASTContext();

ASSERT_EQ(Context.getDiagnostics().getClient()->getNumErrors(), 0U);

auto Results = match(
decl(anyOf(functionDecl(hasName("Target"), isTemplateInstantiation())
.bind("target"),
fieldDecl(hasName("member")).bind("member"),
recordDecl(hasName("S")).bind("struct"))),
Context);
const auto *Fun = selectFirst<FunctionDecl>("target", Results);
const auto *Struct = selectFirst<RecordDecl>("struct", Results);
const auto *Member = selectFirst<FieldDecl>("member", Results);
ASSERT_THAT(Fun, NotNull());
ASSERT_THAT(Struct, NotNull());
ASSERT_THAT(Member, NotNull());

// Verify that `member` is modeled for `S` when we analyze
// `Target<&S::accessor>`.
Environment Env(DAContext, *Fun);
EXPECT_THAT(DAContext.getModeledFields(QualType(Struct->getTypeForDecl(), 0)),
Contains(Member));
}

TEST_F(EnvironmentTest, RefreshRecordValue) {
using namespace ast_matchers;

Expand Down