Skip to content

[clang][dataflow] Remove a deprecated CachedConstAccessorsLattice API #127001

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
Feb 13, 2025
Merged

[clang][dataflow] Remove a deprecated CachedConstAccessorsLattice API #127001

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
40 changes: 0 additions & 40 deletions clang/include/clang/Analysis/FlowSensitive/CachedConstAccessorsLattice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,6 @@ template <typename Base> class CachedConstAccessorsLattice : public Base {
getOrCreateConstMethodReturnValue(const RecordStorageLocation &RecordLoc,
const CallExpr *CE, Environment &Env);

/// Creates or returns a previously created `StorageLocation` associated with
/// a const method call `obj.getFoo()` where `RecordLoc` is the
/// `RecordStorageLocation` of `obj`.
///
/// The callback `Initialize` runs on the storage location if newly created.
/// Returns nullptr if unable to find or create a value.
///
/// Requirements:
///
/// - `CE` should return a location (GLValue or a record type).
///
/// DEPRECATED: switch users to the below overload which takes Callee and Type
/// directly.
StorageLocation *getOrCreateConstMethodReturnStorageLocation(
const RecordStorageLocation &RecordLoc, const CallExpr *CE,
Environment &Env, llvm::function_ref<void(StorageLocation &)> Initialize);

/// Creates or returns a previously created `StorageLocation` associated with
/// a const method call `obj.getFoo()` where `RecordLoc` is the
/// `RecordStorageLocation` of `obj`, `Callee` is the decl for `getFoo`.
Expand Down Expand Up @@ -208,29 +191,6 @@ Value *CachedConstAccessorsLattice<Base>::getOrCreateConstMethodReturnValue(
return Val;
}

template <typename Base>
StorageLocation *
CachedConstAccessorsLattice<Base>::getOrCreateConstMethodReturnStorageLocation(
const RecordStorageLocation &RecordLoc, const CallExpr *CE,
Environment &Env, llvm::function_ref<void(StorageLocation &)> Initialize) {
assert(!CE->getType().isNull());
assert(CE->isGLValue() || CE->getType()->isRecordType());
auto &ObjMap = ConstMethodReturnStorageLocations[&RecordLoc];
const FunctionDecl *DirectCallee = CE->getDirectCallee();
if (DirectCallee == nullptr)
return nullptr;
auto it = ObjMap.find(DirectCallee);
if (it != ObjMap.end())
return it->second;

StorageLocation &Loc =
Env.createStorageLocation(CE->getType().getNonReferenceType());
Initialize(Loc);

ObjMap.insert({DirectCallee, &Loc});
return &Loc;
}

template <typename Base>
StorageLocation &
CachedConstAccessorsLattice<Base>::getOrCreateConstMethodReturnStorageLocation(
Expand Down
59 changes: 18 additions & 41 deletions clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,33 +128,6 @@ TEST_F(CachedConstAccessorsLatticeTest, SameLocBeforeClearOrDiffAfterClear) {
RecordStorageLocation Loc(Inputs.SType, RecordStorageLocation::FieldToLoc(),
{});

LatticeT Lattice;
auto NopInit = [](StorageLocation &) {};
StorageLocation *Loc1 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NopInit);
auto NotCalled = [](StorageLocation &) {
ASSERT_TRUE(false) << "Not reached";
};
StorageLocation *Loc2 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NotCalled);

EXPECT_EQ(Loc1, Loc2);

Lattice.clearConstMethodReturnStorageLocations(Loc);
StorageLocation *Loc3 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NopInit);

EXPECT_NE(Loc3, Loc1);
EXPECT_NE(Loc3, Loc2);
}

TEST_F(CachedConstAccessorsLatticeTest,
SameLocBeforeClearOrDiffAfterClearWithCallee) {
CommonTestInputs Inputs;
auto *CE = Inputs.CallRef;
RecordStorageLocation Loc(Inputs.SType, RecordStorageLocation::FieldToLoc(),
{});

LatticeT Lattice;
auto NopInit = [](StorageLocation &) {};
const FunctionDecl *Callee = CE->getDirectCallee();
Expand Down Expand Up @@ -204,22 +177,24 @@ TEST_F(CachedConstAccessorsLatticeTest,
// Accessors that return a record by value are modeled by a record storage
// location (instead of a Value).
auto NopInit = [](StorageLocation &) {};
StorageLocation *Loc1 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NopInit);
const FunctionDecl *Callee = CE->getDirectCallee();
ASSERT_NE(Callee, nullptr);
StorageLocation &Loc1 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, Callee, Env, NopInit);
auto NotCalled = [](StorageLocation &) {
ASSERT_TRUE(false) << "Not reached";
};
StorageLocation *Loc2 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NotCalled);
StorageLocation &Loc2 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, Callee, Env, NotCalled);

EXPECT_EQ(Loc1, Loc2);
EXPECT_EQ(&Loc1, &Loc2);

Lattice.clearConstMethodReturnStorageLocations(Loc);
StorageLocation *Loc3 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, CE, Env, NopInit);
StorageLocation &Loc3 = Lattice.getOrCreateConstMethodReturnStorageLocation(
Loc, Callee, Env, NopInit);

EXPECT_NE(Loc3, Loc1);
EXPECT_NE(Loc3, Loc1);
EXPECT_NE(&Loc3, &Loc1);
EXPECT_NE(&Loc3, &Loc1);
}

TEST_F(CachedConstAccessorsLatticeTest, ClearDifferentLocs) {
Expand All @@ -232,18 +207,20 @@ TEST_F(CachedConstAccessorsLatticeTest, ClearDifferentLocs) {

LatticeT Lattice;
auto NopInit = [](StorageLocation &) {};
StorageLocation *RetLoc1 =
Lattice.getOrCreateConstMethodReturnStorageLocation(LocS1, CE, Env,
const FunctionDecl *Callee = CE->getDirectCallee();
ASSERT_NE(Callee, nullptr);
StorageLocation &RetLoc1 =
Lattice.getOrCreateConstMethodReturnStorageLocation(LocS1, Callee, Env,
NopInit);
Lattice.clearConstMethodReturnStorageLocations(LocS2);
auto NotCalled = [](StorageLocation &) {
ASSERT_TRUE(false) << "Not reached";
};
StorageLocation *RetLoc2 =
Lattice.getOrCreateConstMethodReturnStorageLocation(LocS1, CE, Env,
StorageLocation &RetLoc2 =
Lattice.getOrCreateConstMethodReturnStorageLocation(LocS1, Callee, Env,
NotCalled);

EXPECT_EQ(RetLoc1, RetLoc2);
EXPECT_EQ(&RetLoc1, &RetLoc2);
}

TEST_F(CachedConstAccessorsLatticeTest, DifferentValsFromDifferentLocs) {
Expand Down