[PATCH] D150656: [clang][dataflow] Use `Strict` accessors in TypeErasedDataflowAnalysis.cpp.
Martin Böhme via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Tue May 16 03:17:02 PDT 2023
mboehme created this revision.
Herald added subscribers: martong, xazax.hun.
Herald added a reviewer: NoQ.
Herald added a project: All.
mboehme requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This patch is part of the ongoing migration to strict handling of value
categories (see https://discourse.llvm.org/t/70086 for details).
Depends On D150655 <https://reviews.llvm.org/D150655>
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D150656
Files:
clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
Index: clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
+++ clang/lib/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.cpp
@@ -123,13 +123,10 @@
private:
TerminatorVisitorRetTy extendFlowCondition(const Expr &Cond) {
// The terminator sub-expression might not be evaluated.
- if (Env.getStorageLocation(Cond, SkipPast::None) == nullptr)
+ if (Env.getValueStrict(Cond) == nullptr)
transfer(StmtToEnv, Cond, Env);
- // FIXME: The flow condition must be an r-value, so `SkipPast::None` should
- // suffice.
- auto *Val =
- cast_or_null<BoolValue>(Env.getValue(Cond, SkipPast::Reference));
+ auto *Val = cast_or_null<BoolValue>(Env.getValueStrict(Cond));
// Value merging depends on flow conditions from different environments
// being mutually exclusive -- that is, they cannot both be true in their
// entirety (even if they may share some clauses). So, we need *some* value
@@ -303,18 +300,18 @@
auto *InitStmt = Init->getInit();
assert(InitStmt != nullptr);
- auto *InitStmtLoc = Env.getStorageLocation(*InitStmt, SkipPast::Reference);
- if (InitStmtLoc == nullptr)
- return;
-
- auto *InitStmtVal = Env.getValue(*InitStmtLoc);
- if (InitStmtVal == nullptr)
- return;
-
if (Member->getType()->isReferenceType()) {
+ auto *InitStmtLoc = Env.getStorageLocationStrict(*InitStmt);
+ if (InitStmtLoc == nullptr)
+ return;
+
auto &MemberLoc = ThisLoc.getChild(*Member);
Env.setValue(MemberLoc, Env.create<ReferenceValue>(*InitStmtLoc));
} else {
+ auto *InitStmtVal = Env.getValueStrict(*InitStmt);
+ if (InitStmtVal == nullptr)
+ return;
+
auto &MemberLoc = ThisLoc.getChild(*Member);
Env.setValue(MemberLoc, *InitStmtVal);
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D150656.522517.patch
Type: text/x-patch
Size: 1900 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230516/02cb932c/attachment.bin>
More information about the cfe-commits
mailing list