wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[analyzer] Tidy up a few uses of Optional in RegionStore. 

Some that I just added needed conversion to use 'None', others looked
better using Optional<SVal>::create.

No functionality change.

llvm-svn: 175714
This commit is contained in:
Jordan Rose 2013-02-21 03:12:21 +00:00
parent c2b5d1f9b9
commit 55219d55a6
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/StaticAnalyzer/Core/RegionStore.cpp
View File

@ -225,9 +225,7 @@ public:
typedef const RegionBindingsRef& RegionBindingsConstRef; typedef const RegionBindingsRef& RegionBindingsConstRef;
Optional<SVal> RegionBindingsRef::getDirectBinding(const MemRegion *R) const { Optional<SVal> RegionBindingsRef::getDirectBinding(const MemRegion *R) const {
if (const SVal *V = lookup(R, BindingKey::Direct)) return Optional<SVal>::create(lookup(R, BindingKey::Direct));
return *V;
return None;
} }
Optional<SVal> RegionBindingsRef::getDefaultBinding(const MemRegion *R) const { Optional<SVal> RegionBindingsRef::getDefaultBinding(const MemRegion *R) const {
@ -235,9 +233,8 @@ Optional<SVal> RegionBindingsRef::getDefaultBinding(const MemRegion *R) const {
if (const TypedValueRegion *TR = dyn_cast<TypedValueRegion>(R)) if (const TypedValueRegion *TR = dyn_cast<TypedValueRegion>(R))
if (TR->getValueType()->isUnionType()) if (TR->getValueType()->isUnionType())
return UnknownVal(); return UnknownVal();
if (const SVal *V = lookup(R, BindingKey::Default))
return *V; return Optional<SVal>::create(lookup(R, BindingKey::Default));
return None;
} }
RegionBindingsRef RegionBindingsRef::addBinding(BindingKey K, SVal V) const { RegionBindingsRef RegionBindingsRef::addBinding(BindingKey K, SVal V) const {
@ -1267,11 +1264,11 @@ getExistingLazyBinding(SValBuilder &SVB, RegionBindingsConstRef B,
const SubRegion *R, bool AllowSubregionBindings) { const SubRegion *R, bool AllowSubregionBindings) {
Optional<SVal> V = B.getDefaultBinding(R); Optional<SVal> V = B.getDefaultBinding(R);
if (!V) if (!V)
return Optional<nonloc::LazyCompoundVal>(); return None;
Optional<nonloc::LazyCompoundVal> LCV = V->getAs<nonloc::LazyCompoundVal>(); Optional<nonloc::LazyCompoundVal> LCV = V->getAs<nonloc::LazyCompoundVal>();
if (!LCV) if (!LCV)
return Optional<nonloc::LazyCompoundVal>(); return None;
// If the LCV is for a subregion, the types won't match, and we shouldn't // If the LCV is for a subregion, the types won't match, and we shouldn't
// reuse the binding. Unfortuately we can only check this if the destination // reuse the binding. Unfortuately we can only check this if the destination
@ -1280,7 +1277,7 @@ getExistingLazyBinding(SValBuilder &SVB, RegionBindingsConstRef B,
QualType RegionTy = TVR->getValueType(); QualType RegionTy = TVR->getValueType();
QualType SourceRegionTy = LCV->getRegion()->getValueType(); QualType SourceRegionTy = LCV->getRegion()->getValueType();
if (!SVB.getContext().hasSameUnqualifiedType(RegionTy, SourceRegionTy)) if (!SVB.getContext().hasSameUnqualifiedType(RegionTy, SourceRegionTy))
return Optional<nonloc::LazyCompoundVal>(); return None;
} }
if (!AllowSubregionBindings) { if (!AllowSubregionBindings) {
@ -1290,7 +1287,7 @@ getExistingLazyBinding(SValBuilder &SVB, RegionBindingsConstRef B,
collectSubRegionKeys(Keys, SVB, *B.lookup(R->getBaseRegion()), R, collectSubRegionKeys(Keys, SVB, *B.lookup(R->getBaseRegion()), R,
/*IncludeAllDefaultBindings=*/true); /*IncludeAllDefaultBindings=*/true);
if (Keys.size() > 1) if (Keys.size() > 1)
return Optional<nonloc::LazyCompoundVal>(); return None;
} }
return *LCV; return *LCV;