rename: MemRegion:

 RValueType => ObjectType
 LValueType => LocationType

No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71304 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Analysis/PathSensitive/GRState.h b/include/clang/Analysis/PathSensitive/GRState.h
index 37af0caadf336793036ee3c12767eaf7c04a3d84..2fc8b9238879805ec717da26cf5c5638e2e557dc 100644 (file)
--- a/include/clang/Analysis/PathSensitive/GRState.h
+++ b/include/clang/Analysis/PathSensitive/GRState.h
@@ -513,7 +513,7 @@ public:
       return UnknownVal();
     
     if (const TypedRegion *TR = dyn_cast<TypedRegion>(R)) {
-      QualType T = TR->getRValueType(getContext());
+      QualType T = TR->getObjectType(getContext());
       if (Loc::IsLocType(T) || T->isIntegerType())
         return GetSVal(state, R);
     }

diff --git a/include/clang/Analysis/PathSensitive/MemRegion.h b/include/clang/Analysis/PathSensitive/MemRegion.h
index db4a62dbce6356a1acb2e4760a4fee3a6295773f..690ff555b73704511d33a4546e24b1030a41e670 100644 (file)
--- a/include/clang/Analysis/PathSensitive/MemRegion.h
+++ b/include/clang/Analysis/PathSensitive/MemRegion.h
@@ -148,24 +148,24 @@ protected:
   TypedRegion(const MemRegion* sReg, Kind k) : SubRegion(sReg, k) {}
   
 public:
-  virtual QualType getRValueType(ASTContext &C) const = 0;
+  virtual QualType getObjectType(ASTContext &C) const = 0;
   
-  virtual QualType getLValueType(ASTContext& C) const {
+  virtual QualType getLocationType(ASTContext& C) const {
     // FIXME: We can possibly optimize this later to cache this value.
-    return C.getPointerType(getRValueType(C));
+    return C.getPointerType(getObjectType(C));
   }
   
-  QualType getDesugaredRValueType(ASTContext& C) const {
-    QualType T = getRValueType(C);
+  QualType getDesugaredObjectType(ASTContext& C) const {
+    QualType T = getObjectType(C);
     return T.getTypePtr() ? T->getDesugaredType() : T;
   }
   
-  QualType getDesugaredLValueType(ASTContext& C) const {
-    return getLValueType(C)->getDesugaredType();
+  QualType getDesugaredLocationType(ASTContext& C) const {
+    return getLocationType(C)->getDesugaredType();
   }
 
   bool isBoundable(ASTContext &C) const {
-    return !getRValueType(C).isNull();
+    return !getObjectType(C).isNull();
   }
 
   static bool classof(const MemRegion* R) {
@@ -206,13 +206,13 @@ public:
       Data(sym),
       LocationType(t) {}
 
-  QualType getRValueType(ASTContext &C) const {
+  QualType getObjectType(ASTContext &C) const {
     // Do not get the object type of a CodeTextRegion.
     assert(0);
     return QualType();
   }
 
-  QualType getLValueType(ASTContext &C) const {
+  QualType getLocationType(ASTContext &C) const {
     return LocationType;
   }
 
@@ -287,7 +287,9 @@ public:
 
   const StringLiteral* getStringLiteral() const { return Str; }
     
-  QualType getRValueType(ASTContext& C) const;
+  QualType getObjectType(ASTContext& C) const {
+    return Str->getType();
+  }
 
   void Profile(llvm::FoldingSetNodeID& ID) const {
     ProfileRegion(ID, Str, superRegion);
@@ -314,11 +316,11 @@ public:
 
   void print(llvm::raw_ostream& os) const;
   
-  QualType getLValueType(ASTContext&) const {
+  QualType getLocationType(ASTContext&) const {
     return LValueType;
   }
 
-  QualType getRValueType(ASTContext&) const {
+  QualType getObjectType(ASTContext&) const {
     const PointerType* PTy = LValueType->getAsPointerType();
     assert(PTy);
     return PTy->getPointeeType();
@@ -355,7 +357,7 @@ private:
                             const CompoundLiteralExpr* CL,
                             const MemRegion* superRegion);
 public:
-  QualType getRValueType(ASTContext& C) const {
+  QualType getObjectType(ASTContext& C) const {
     return C.getCanonicalType(CL->getType());
   }
   
@@ -384,8 +386,6 @@ public:
   const Decl* getDecl() const { return D; }
   void Profile(llvm::FoldingSetNodeID& ID) const;
       
-  QualType getRValueType(ASTContext& C) const = 0;
-  
   static bool classof(const MemRegion* R) {
     unsigned k = R->getKind();
     return k > BEG_DECL_REGIONS && k < END_DECL_REGIONS;
@@ -406,7 +406,7 @@ class VarRegion : public DeclRegion {
 public:  
   const VarDecl* getDecl() const { return cast<VarDecl>(D); }  
   
-  QualType getRValueType(ASTContext& C) const { 
+  QualType getObjectType(ASTContext& C) const { 
     // FIXME: We can cache this if needed.
     return C.getCanonicalType(getDecl()->getType());
   }    
@@ -430,7 +430,7 @@ public:
   
   const FieldDecl* getDecl() const { return cast<FieldDecl>(D); }
     
-  QualType getRValueType(ASTContext& C) const { 
+  QualType getObjectType(ASTContext& C) const { 
     // FIXME: We can cache this if needed.
     return C.getCanonicalType(getDecl()->getType());
   }    
@@ -462,7 +462,7 @@ public:
     return cast<ObjCInterfaceDecl>(D);
   }
   
-  QualType getRValueType(ASTContext& C) const {
+  QualType getObjectType(ASTContext& C) const {
     return C.getObjCInterfaceType(getInterface());
   }
   
@@ -485,7 +485,7 @@ class ObjCIvarRegion : public DeclRegion {
   
 public:
   const ObjCIvarDecl* getDecl() const { return cast<ObjCIvarDecl>(D); }
-  QualType getRValueType(ASTContext&) const { return getDecl()->getType(); }
+  QualType getObjectType(ASTContext&) const { return getDecl()->getType(); }
   
   static bool classof(const MemRegion* R) {
     return R->getKind() == ObjCIvarRegionKind;
@@ -513,7 +513,7 @@ public:
 
   SVal getIndex() const { return Index; }
 
-  QualType getRValueType(ASTContext&) const {
+  QualType getObjectType(ASTContext&) const {
     return ElementType;
   }
   

diff --git a/lib/Analysis/BasicObjCFoundationChecks.cpp b/lib/Analysis/BasicObjCFoundationChecks.cpp
index 0eee9374da362121724532885f80ba36e16ae908..112a3a1d661945cab3c905074461b454b166998b 100644 (file)
--- a/lib/Analysis/BasicObjCFoundationChecks.cpp
+++ b/lib/Analysis/BasicObjCFoundationChecks.cpp
@@ -417,7 +417,7 @@ bool AuditCFNumberCreate::Audit(ExplodedNode<GRState>* N,GRStateManager&){
     if (!R) return false;
   }
   
-  QualType T = Ctx.getCanonicalType(R->getRValueType(Ctx));
+  QualType T = Ctx.getCanonicalType(R->getObjectType(Ctx));
   
   // FIXME: If the pointee isn't an integer type, should we flag a warning?
   //  People can do weird stuff with pointers.

diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp
index 598191f578194827b596af5d86e4cea3fb0435bf..e4e0cfa983b69c603055e9c51869fb63641648a7 100644 (file)
--- a/lib/Analysis/BasicStore.cpp
+++ b/lib/Analysis/BasicStore.cpp
@@ -290,7 +290,7 @@ SVal BasicStoreManager::Retrieve(const GRState* state, Loc loc, QualType T) {
         // Just support void**, void***, intptr_t*, intptr_t**, etc., for now.
         // This is needed to handle OSCompareAndSwapPtr() and friends.
         ASTContext &Ctx = StateMgr.getContext();
-        QualType T = ER->getLValueType(Ctx);
+        QualType T = ER->getLocationType(Ctx);
 
         if (!isHigherOrderRawPtr(T, Ctx))
           return UnknownVal();
@@ -334,7 +334,7 @@ Store BasicStoreManager::BindInternal(Store store, Loc loc, SVal V) {
       if (isa<Loc>(V) || isa<nonloc::LocAsInteger>(V))
         if (const ElementRegion *ER = dyn_cast<ElementRegion>(R)) {
           // FIXME: Should check for index 0.
-          QualType T = ER->getLValueType(C);
+          QualType T = ER->getLocationType(C);
         
           if (isHigherOrderRawPtr(T, C))
             R = ER->getSuperRegion();
@@ -357,7 +357,7 @@ Store BasicStoreManager::BindInternal(Store store, Loc loc, SVal V) {
         // elsewhere. Food for thought.
         if (const TypedRegion *TyR = dyn_cast<TypedRegion>(R)) {
           if (TyR->isBoundable(C) &&
-              Loc::IsLocType(TyR->getRValueType(C)))              
+              Loc::IsLocType(TyR->getObjectType(C)))              
             V = X->getLoc();
         }
       }

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index c8d0bf78ae3cccc2d39469398140e916f4cb9f12..0e4d660f35af9ff54f4ab027e0f1ff4443dfca5e 100644 (file)
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -2612,7 +2612,7 @@ void CFRefCount::EvalSummary(ExplodedNodeSet<GRState>& Dst,
           if (R->isBoundable(Ctx)) {
             // Set the value of the variable to be a conjured symbol.
             unsigned Count = Builder.getCurrentBlockCount();
-            QualType T = R->getRValueType(Ctx);
+            QualType T = R->getObjectType(Ctx);
           
             if (Loc::IsLocType(T) || (T->isIntegerType() && T->isScalarType())){
               ValueManager &ValMgr = Eng.getValueManager();

diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 7054f3c0bb502f49aa84a89aa72426cebe73df72..b92705c3bc4218274c1cf5cfa151c626cdb16a6c 100644 (file)
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -1785,7 +1785,7 @@ void GRExprEngine::VisitObjCForCollectionStmtAux(ObjCForCollectionStmt* S,
       // FIXME: The proper thing to do is to really iterate over the
       //  container.  We will do this with dispatch logic to the store.
       //  For now, just 'conjure' up a symbolic value.
-      QualType T = R->getRValueType(getContext());
+      QualType T = R->getObjectType(getContext());
       assert (Loc::IsLocType(T));
       unsigned Count = Builder->getCurrentBlockCount();
       SymbolRef Sym = SymMgr.getConjuredSymbol(elem, T, Count);

diff --git a/lib/Analysis/MemRegion.cpp b/lib/Analysis/MemRegion.cpp
index 84fd163093aa09bb97f771849e24c50a6c443f72..9f066f44692fb010e3844b254484009a8c8c9fe5 100644 (file)
--- a/lib/Analysis/MemRegion.cpp
+++ b/lib/Analysis/MemRegion.cpp
@@ -120,14 +120,6 @@ void CodeTextRegion::Profile(llvm::FoldingSetNodeID& ID) const {
   CodeTextRegion::ProfileRegion(ID, Data, LocationType);
 }
 
-//===----------------------------------------------------------------------===//
-// getLValueType() and getRValueType()
-//===----------------------------------------------------------------------===//
-
-QualType StringRegion::getRValueType(ASTContext& C) const {
-  return Str->getType();
-}
-
 //===----------------------------------------------------------------------===//
 // Region pretty-printing.
 //===----------------------------------------------------------------------===//

diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 017526cb83b501f4d28a837b9b004b89cc8790d4..ff86708c350cccf58a366b53e075e7e56d8035c4 100644 (file)
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -492,7 +492,7 @@ SVal RegionStoreManager::getSizeInElements(const GRState* St,
                                            const MemRegion* R) {
   if (const VarRegion* VR = dyn_cast<VarRegion>(R)) {
     // Get the type of the variable.
-    QualType T = VR->getDesugaredRValueType(getContext());
+    QualType T = VR->getDesugaredObjectType(getContext());
 
     // FIXME: Handle variable-length arrays.
     if (isa<VariableArrayType>(T))
@@ -510,7 +510,7 @@ SVal RegionStoreManager::getSizeInElements(const GRState* St,
     // that type.
     if (CastTy) {
       QualType EleTy =cast<PointerType>(CastTy->getTypePtr())->getPointeeType();
-      QualType VarTy = VR->getRValueType(getContext());
+      QualType VarTy = VR->getObjectType(getContext());
       uint64_t EleSize = getContext().getTypeSize(EleTy);
       uint64_t VarSize = getContext().getTypeSize(VarTy);
       return NonLoc::MakeIntVal(getBasicVals(), VarSize / EleSize, false);
@@ -545,7 +545,7 @@ SVal RegionStoreManager::getSizeInElements(const GRState* St,
     llvm::APSInt SSize = cast<nonloc::ConcreteInt>(*Extent).getValue();
 
     // Get the size of the element in bits.
-    QualType LvT = ATR->getLValueType(getContext());
+    QualType LvT = ATR->getLocationType(getContext());
     QualType ElemTy = cast<PointerType>(LvT.getTypePtr())->getPointeeType();
 
     uint64_t X = getContext().getTypeSize(ElemTy);
@@ -605,8 +605,8 @@ SVal RegionStoreManager::ArrayToPointer(Loc Array) {
   if (!ArrayR)
     return UnknownVal();
   
-  // Strip off typedefs from the ArrayRegion's RvalueType.
-  QualType T = ArrayR->getRValueType(getContext())->getDesugaredType();
+  // Strip off typedefs from the ArrayRegion's ObjectType.
+  QualType T = ArrayR->getObjectType(getContext())->getDesugaredType();
   ArrayType *AT = cast<ArrayType>(T);
   T = AT->getElementType();
   
@@ -643,7 +643,7 @@ RegionStoreManager::CastRegion(const GRState* state, const MemRegion* R,
 
   // Return the same region if the region types are compatible.
   if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) {
-    QualType Ta = Ctx.getCanonicalType(TR->getLValueType(Ctx));
+    QualType Ta = Ctx.getCanonicalType(TR->getLocationType(Ctx));
 
     if (Ta == ToTy)
       return CastResult(state, R);
@@ -676,7 +676,7 @@ RegionStoreManager::CastRegion(const GRState* state, const MemRegion* R,
         return CastResult(state, R);
     }
 
-    QualType ObjTy = cast<TypedRegion>(R)->getRValueType(getContext());
+    QualType ObjTy = cast<TypedRegion>(R)->getObjectType(getContext());
     uint64_t PointeeTySize = getContext().getTypeSize(PointeeTy);
     uint64_t ObjTySize = getContext().getTypeSize(ObjTy);
 
@@ -722,7 +722,7 @@ SVal RegionStoreManager::EvalBinOp(BinaryOperator::Opcode Op, Loc L, NonLoc R) {
     // p += 3;
     // Note that p binds to a TypedViewRegion(SymbolicRegion).
     nonloc::ConcreteInt Idx(getBasicVals().getZeroWithPtrWidth(false));
-    ER = MRMgr.getElementRegion(TR->getRValueType(getContext()), Idx, TR);
+    ER = MRMgr.getElementRegion(TR->getObjectType(getContext()), Idx, TR);
   }
 
   SVal Idx = ER->getIndex();
@@ -782,7 +782,7 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) {
   //
   // Such funny addressing will occur due to layering of regions.
 
-  QualType RTy = R->getRValueType(getContext());
+  QualType RTy = R->getObjectType(getContext());
 
   if (RTy->isStructureType())
     return RetrieveStruct(St, R);
@@ -868,8 +868,7 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) {
 }
 
 SVal RegionStoreManager::RetrieveStruct(const GRState* St,const TypedRegion* R){
-  // FIXME: Verify we want getRValueType instead of getLValueType.
-  QualType T = R->getRValueType(getContext());
+  QualType T = R->getObjectType(getContext());
   assert(T->isStructureType());
 
   const RecordType* RT = cast<RecordType>(T.getTypePtr());
@@ -894,7 +893,7 @@ SVal RegionStoreManager::RetrieveStruct(const GRState* St,const TypedRegion* R){
 }
 
 SVal RegionStoreManager::RetrieveArray(const GRState* St, const TypedRegion* R){
-  QualType T = R->getRValueType(getContext());
+  QualType T = R->getObjectType(getContext());
   ConstantArrayType* CAT = cast<ConstantArrayType>(T.getTypePtr());
 
   llvm::ImmutableList<SVal> ArrayVal = getBasicVals().getEmptySValList();
@@ -904,7 +903,7 @@ SVal RegionStoreManager::RetrieveArray(const GRState* St, const TypedRegion* R){
 
   for (; i < Size; ++i) {
     SVal Idx = NonLoc::MakeVal(getBasicVals(), i);
-    ElementRegion* ER = MRMgr.getElementRegion(R->getRValueType(getContext()),
+    ElementRegion* ER = MRMgr.getElementRegion(R->getObjectType(getContext()),
                                                Idx, R);
     QualType ETy = ER->getElementType();
     SVal ElementVal = Retrieve(St, loc::MemRegionVal(ER), ETy);
@@ -921,8 +920,7 @@ const GRState* RegionStoreManager::Bind(const GRState* St, Loc L, SVal V) {
 
   // Check if the region is a struct region.
   if (const TypedRegion* TR = dyn_cast<TypedRegion>(R))
-    // FIXME: Verify we want getRValueType().
-    if (TR->getRValueType(getContext())->isStructureType())
+    if (TR->getObjectType(getContext())->isStructureType())
       return BindStruct(St, TR, V);
 
   Store store = St->getStore();
@@ -1156,9 +1154,7 @@ void RegionStoreManager::print(Store store, std::ostream& Out,
 
 const GRState* RegionStoreManager::BindArray(const GRState* St, 
                                              const TypedRegion* R, SVal Init) {
-  
-  // FIXME: Verify we should use getLValueType or getRValueType.
-  QualType T = R->getRValueType(getContext());
+  QualType T = R->getObjectType(getContext());
   assert(T->isArrayType());
 
   // When we are binding the whole array, it always has default value 0.
@@ -1223,8 +1219,7 @@ const GRState* RegionStoreManager::BindArray(const GRState* St,
 
 const GRState*
 RegionStoreManager::BindStruct(const GRState* St, const TypedRegion* R, SVal V){
-  // FIXME: Verify that we should use getRValueType or getLValueType.
-  QualType T = R->getRValueType(getContext());
+  QualType T = R->getObjectType(getContext());
   assert(T->isStructureType());
 
   const RecordType* RT = T->getAsRecordType();

diff --git a/lib/Analysis/SVals.cpp b/lib/Analysis/SVals.cpp
index 724b8cf8c5d59974151e8df57547b4f53206f7dd..1090aaa681f49242d4db856ed30741c80d79f020 100644 (file)
--- a/lib/Analysis/SVals.cpp
+++ b/lib/Analysis/SVals.cpp
@@ -301,7 +301,7 @@ SVal ValueManager::getRValueSymbolVal(const MemRegion* R) {
   SymbolRef sym = SymMgr.getRegionRValueSymbol(R);
                                 
   if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) {
-    QualType T = TR->getRValueType(SymMgr.getContext());
+    QualType T = TR->getObjectType(SymMgr.getContext());
 
     // If T is of function pointer type, create a CodeTextRegion wrapping a
     // symbol.

diff --git a/lib/Analysis/Store.cpp b/lib/Analysis/Store.cpp
index 49411b468e59158ae4f1d3ff5ca7b03c02062a76..13326ab31f8230a867460cb8ef01300247014272 100644 (file)
--- a/lib/Analysis/Store.cpp
+++ b/lib/Analysis/Store.cpp
@@ -32,7 +32,7 @@ StoreManager::CastRegion(const GRState* state, const MemRegion* R,
 
   // Return the same region if the region types are compatible.
   if (const TypedRegion* TR = dyn_cast<TypedRegion>(R)) {
-    QualType Ta = Ctx.getCanonicalType(TR->getLValueType(Ctx));
+    QualType Ta = Ctx.getCanonicalType(TR->getLocationType(Ctx));
 
     if (Ta == ToTy)
       return CastResult(state, R);

diff --git a/lib/Analysis/SymbolManager.cpp b/lib/Analysis/SymbolManager.cpp
index f8e2db72688813bdcefc39d6117aa8667defcfaf..ee18f2c9e48f98c19a84b39028dd01f290d4f4f5 100644 (file)
--- a/lib/Analysis/SymbolManager.cpp
+++ b/lib/Analysis/SymbolManager.cpp
@@ -167,7 +167,7 @@ QualType SymbolConjured::getType(ASTContext&) const {
 
 QualType SymbolRegionRValue::getType(ASTContext& C) const {
   if (const TypedRegion* TR = dyn_cast<TypedRegion>(R))
-    return TR->getRValueType(C);
+    return TR->getObjectType(C);
   
   return QualType();
 }