Skip to content

Commit

Permalink
[clang][dataflow] Rename member to make it clear that it isn't stable
Browse files Browse the repository at this point in the history
Rename `DataflowAnalysisContext::getStableStorageLocation(QualType)`
to `createStorageLocation`, to make it clear that it doesn't return
a stable storage location.

Differential Revision: https://reviews.llvm.org/D131021

Reviewed-by: ymandel, xazax.hun, gribozavr2
  • Loading branch information
sgatev committed Aug 3, 2022
1 parent 9ef1161 commit 817dd5e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
Expand Up @@ -90,12 +90,12 @@ class DataflowAnalysisContext {
return *cast<T>(Vals.back().get());
}

/// Returns a stable storage location appropriate for `Type`.
/// Returns a new storage location appropriate for `Type`.
///
/// Requirements:
///
/// `Type` must not be null.
StorageLocation &getStableStorageLocation(QualType Type);
StorageLocation &createStorageLocation(QualType Type);

/// Returns a stable storage location for `D`.
StorageLocation &getStableStorageLocation(const VarDecl &D);
Expand Down
11 changes: 5 additions & 6 deletions clang/lib/Analysis/FlowSensitive/DataflowAnalysisContext.cpp
Expand Up @@ -24,15 +24,14 @@
namespace clang {
namespace dataflow {

StorageLocation &
DataflowAnalysisContext::getStableStorageLocation(QualType Type) {
StorageLocation &DataflowAnalysisContext::createStorageLocation(QualType Type) {
if (!Type.isNull() &&
(Type->isStructureOrClassType() || Type->isUnionType())) {
// FIXME: Explore options to avoid eager initialization of fields as some of
// them might not be needed for a particular analysis.
llvm::DenseMap<const ValueDecl *, StorageLocation *> FieldLocs;
for (const FieldDecl *Field : getObjectFields(Type))
FieldLocs.insert({Field, &getStableStorageLocation(Field->getType())});
FieldLocs.insert({Field, &createStorageLocation(Field->getType())});
return takeOwnership(
std::make_unique<AggregateStorageLocation>(Type, std::move(FieldLocs)));
}
Expand All @@ -43,7 +42,7 @@ StorageLocation &
DataflowAnalysisContext::getStableStorageLocation(const VarDecl &D) {
if (auto *Loc = getStorageLocation(D))
return *Loc;
auto &Loc = getStableStorageLocation(D.getType());
auto &Loc = createStorageLocation(D.getType());
setStorageLocation(D, Loc);
return Loc;
}
Expand All @@ -52,7 +51,7 @@ StorageLocation &
DataflowAnalysisContext::getStableStorageLocation(const Expr &E) {
if (auto *Loc = getStorageLocation(E))
return *Loc;
auto &Loc = getStableStorageLocation(E.getType());
auto &Loc = createStorageLocation(E.getType());
setStorageLocation(E, Loc);
return Loc;
}
Expand All @@ -63,7 +62,7 @@ DataflowAnalysisContext::getOrCreateNullPointerValue(QualType PointeeType) {
PointeeType.isNull() ? PointeeType : PointeeType.getCanonicalType();
auto Res = NullPointerVals.try_emplace(CanonicalPointeeType, nullptr);
if (Res.second) {
auto &PointeeLoc = getStableStorageLocation(CanonicalPointeeType);
auto &PointeeLoc = createStorageLocation(CanonicalPointeeType);
Res.first->second =
&takeOwnership(std::make_unique<PointerValue>(PointeeLoc));
}
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
Expand Up @@ -337,7 +337,7 @@ LatticeJoinEffect Environment::join(const Environment &Other,
}

StorageLocation &Environment::createStorageLocation(QualType Type) {
return DACtx->getStableStorageLocation(Type);
return DACtx->createStorageLocation(Type);
}

StorageLocation &Environment::createStorageLocation(const VarDecl &D) {
Expand Down

0 comments on commit 817dd5e

Please sign in to comment.