diff options
| -rw-r--r-- | clang/include/clang/Analysis/PathSensitive/MemRegion.h | 6 | ||||
| -rw-r--r-- | clang/lib/Analysis/MemRegion.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/clang/include/clang/Analysis/PathSensitive/MemRegion.h b/clang/include/clang/Analysis/PathSensitive/MemRegion.h index 376c4403989..310d194effa 100644 --- a/clang/include/clang/Analysis/PathSensitive/MemRegion.h +++ b/clang/include/clang/Analysis/PathSensitive/MemRegion.h @@ -686,7 +686,7 @@ public: RegionTy* getRegion(const A1 a1); template <typename RegionTy, typename A1> - RegionTy* getRegion(const A1 a1, const MemRegion* superRegion); + RegionTy* getSubRegion(const A1 a1, const MemRegion* superRegion); template <typename RegionTy, typename A1, typename A2> RegionTy* getRegion(const A1 a1, const A2 a2); @@ -732,8 +732,8 @@ RegionTy* MemRegionManager::getRegion(const A1 a1) { } template <typename RegionTy, typename A1> -RegionTy* MemRegionManager::getRegion(const A1 a1, const MemRegion *superRegion) -{ +RegionTy* MemRegionManager::getSubRegion(const A1 a1, + const MemRegion *superRegion) { llvm::FoldingSetNodeID ID; RegionTy::ProfileRegion(ID, a1, superRegion); void* InsertPos; diff --git a/clang/lib/Analysis/MemRegion.cpp b/clang/lib/Analysis/MemRegion.cpp index 45305403585..0dac76be115 100644 --- a/clang/lib/Analysis/MemRegion.cpp +++ b/clang/lib/Analysis/MemRegion.cpp @@ -298,24 +298,24 @@ SymbolicRegion* MemRegionManager::getSymbolicRegion(SymbolRef sym) { FieldRegion* MemRegionManager::getFieldRegion(const FieldDecl* d, const MemRegion* superRegion) { - return getRegion<FieldRegion>(d, superRegion); + return getSubRegion<FieldRegion>(d, superRegion); } ObjCIvarRegion* MemRegionManager::getObjCIvarRegion(const ObjCIvarDecl* d, const MemRegion* superRegion) { - return getRegion<ObjCIvarRegion>(d, superRegion); + return getSubRegion<ObjCIvarRegion>(d, superRegion); } ObjCObjectRegion* MemRegionManager::getObjCObjectRegion(const ObjCInterfaceDecl* d, const MemRegion* superRegion) { - return getRegion<ObjCObjectRegion>(d, superRegion); + return getSubRegion<ObjCObjectRegion>(d, superRegion); } TypedViewRegion* MemRegionManager::getTypedViewRegion(QualType t, const MemRegion* superRegion) { - return getRegion<TypedViewRegion>(t, superRegion); + return getSubRegion<TypedViewRegion>(t, superRegion); } AllocaRegion* MemRegionManager::getAllocaRegion(const Expr* E, unsigned cnt) { |
