ASDenysPetrov created this revision.
ASDenysPetrov added reviewers: steakhal, NoQ.
ASDenysPetrov added a project: clang.
Herald added subscribers: manas, martong, dkrupp, donat.nagy, Szelethus,
mikhail.ramalho, a.sidorin, szepet, baloghadamsoftware, xazax.hun.
ASDenysPetrov requested review of this revision.
Herald added a subscriber: cfe-commits.
Make StoreManager::castRegion function usage safier. Replace `const MemRegion
*` with `Optional<const MemRegion *>`. Simplified one of related test cases due
to suggestions in D101635 <https://reviews.llvm.org/D101635>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D103319
Files:
clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
clang/lib/StaticAnalyzer/Core/Store.cpp
Index: clang/lib/StaticAnalyzer/Core/Store.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/Store.cpp
+++ clang/lib/StaticAnalyzer/Core/Store.cpp
@@ -71,7 +71,8 @@
return MRMgr.getElementRegion(T, idx, R, Ctx);
}
-const MemRegion *StoreManager::castRegion(const MemRegion *R, QualType CastToTy) {
+Optional<const MemRegion *> StoreManager::castRegion(const MemRegion *R,
+ QualType CastToTy) {
ASTContext &Ctx = StateMgr.getContext();
// Handle casts to Objective-C objects.
@@ -88,7 +89,7 @@
// We don't know what to make of it. Return a NULL region, which
// will be interpreted as UnknownVal.
- return nullptr;
+ return None;
}
// Now assume we are casting from pointer to pointer. Other cases should
@@ -168,7 +169,7 @@
// If we cannot compute a raw offset, throw up our hands and return
// a NULL MemRegion*.
if (!baseR)
- return nullptr;
+ return None;
CharUnits off = rawOff.getOffset();
Index: clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
===================================================================
--- clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
+++ clang/lib/StaticAnalyzer/Core/SValBuilder.cpp
@@ -753,16 +753,16 @@
if (const auto *SR = dyn_cast<SymbolicRegion>(R)) {
QualType SRTy = SR->getSymbol()->getType();
if (!hasSameUnqualifiedPointeeType(SRTy, CastTy)) {
- R = StateMgr.getStoreManager().castRegion(SR, CastTy);
- return loc::MemRegionVal(R);
+ if (auto OptR = StateMgr.getStoreManager().castRegion(SR, CastTy))
+ return loc::MemRegionVal(*OptR);
}
}
}
// Next fixes pointer dereference using type different from its initial
// one. See PR37503 and PR49007 for details.
if (const auto *ER = dyn_cast<ElementRegion>(R)) {
- if ((R = StateMgr.getStoreManager().castRegion(ER, CastTy)))
- return loc::MemRegionVal(R);
+ if (auto OptR = StateMgr.getStoreManager().castRegion(ER, CastTy))
+ return loc::MemRegionVal(*OptR);
}
return V;
@@ -807,8 +807,8 @@
// Get the result of casting a region to a different type.
const MemRegion *R = V.getRegion();
- if ((R = StateMgr.getStoreManager().castRegion(R, CastTy)))
- return loc::MemRegionVal(R);
+ if (auto OptR = StateMgr.getStoreManager().castRegion(R, CastTy))
+ return loc::MemRegionVal(*OptR);
}
// Pointer to whatever else.
@@ -873,8 +873,8 @@
if (!IsUnknownOriginalType && Loc::isLocType(CastTy) &&
OriginalTy->isIntegralOrEnumerationType()) {
if (const MemRegion *R = L.getAsRegion())
- if ((R = StateMgr.getStoreManager().castRegion(R, CastTy)))
- return loc::MemRegionVal(R);
+ if (auto OptR = StateMgr.getStoreManager().castRegion(R, CastTy))
+ return loc::MemRegionVal(*OptR);
return L;
}
@@ -890,8 +890,8 @@
// Delegate to store manager to get the result of casting a region to a
// different type. If the MemRegion* returned is NULL, this expression
// Evaluates to UnknownVal.
- if ((R = StateMgr.getStoreManager().castRegion(R, CastTy)))
- return loc::MemRegionVal(R);
+ if (auto OptR = StateMgr.getStoreManager().castRegion(R, CastTy))
+ return loc::MemRegionVal(*OptR);
}
} else {
if (Loc::isLocType(CastTy)) {
Index: clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
===================================================================
--- clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+++ clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
@@ -181,7 +181,8 @@
/// castRegion - Used by ExprEngine::VisitCast to handle casts from
/// a MemRegion* to a specific location type. 'R' is the region being
/// casted and 'CastToTy' the result type of the cast.
- const MemRegion *castRegion(const MemRegion *region, QualType CastToTy);
+ Optional<const MemRegion *> castRegion(const MemRegion *region,
+ QualType CastToTy);
virtual StoreRef removeDeadBindings(Store store, const StackFrameContext *LCtx,
SymbolReaper &SymReaper) = 0;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
