Add transfer function support for ObjCIvarRefExpr.

llvm-svn: 57654

clang/include/clang/Analysis/PathSensitive/GRExprEngine.h

@@ -441,6 +441,8 @@ protected:
   }
 
   // Get the lvalue of an expression.
+  // FIXME: Remove this method, and used specialized versions of GetLValue
+  // in GRStateManager.
   RVal GetLValue(const GRState* St, const Expr* Ex) {
     return StateMgr.GetLValue(St, Ex);
   }
@@ -521,6 +523,10 @@ protected:
   /// VisitMemberExpr - Transfer function for member expressions.
   void VisitMemberExpr(MemberExpr* M, NodeTy* Pred, NodeSet& Dst,bool asLValue);
   
+  /// VisitObjCIvarRefExpr - Transfer function logic for ObjCIvarRefExprs.
+  void VisitObjCIvarRefExpr(ObjCIvarRefExpr* DR, NodeTy* Pred, NodeSet& Dst,
+                            bool asLValue); 
+  
   /// VisitObjCMessageExpr - Transfer function for ObjC message expressions.
   void VisitObjCMessageExpr(ObjCMessageExpr* ME, NodeTy* Pred, NodeSet& Dst);
   

clang/include/clang/Analysis/PathSensitive/GRState.h

@@ -346,12 +346,18 @@ public:
   }
 
   // Get the lvalue of expression.
+  // FIXME: Remove this method, and implement specialized versions for
+  //  specific Decls.
   RVal GetLValue(const GRState* St, const Expr* Ex) {
     // Forward to store manager. The lvalue of an expression is determined by
     // the store manager.
     return StoreMgr->getLValue(St, Ex);
   }
   
+  RVal GetLValue(const GRState* St, ObjCIvarDecl* D, RVal Base) {
+    return StoreMgr->getLValue(St, D, Base);
+  }
+
   // Methods that query & manipulate the Environment.
   
   RVal GetRVal(const GRState* St, Expr* Ex) {

clang/include/clang/Analysis/PathSensitive/Store.h

@@ -30,6 +30,7 @@ class GRStateManager;
 class LiveVariables;
 class Stmt;
 class Expr;
+class ObjCIvarDecl;
 class MemRegion;
 class MemRegionManager;
 
@@ -47,8 +48,13 @@ public:
   virtual LVal getLVal(const VarDecl* VD) = 0;  
 
   // Get the lvalue of an expression.
+  // FIXME: Remove this method, and implement specialized versions for
+  //  specific Decls.
   virtual RVal getLValue(const GRState* St, const Expr* Ex) = 0;
   
+  virtual RVal getLValue(const GRState* St, const ObjCIvarDecl* D, RVal Base)=0;
+  
+
   virtual Store
   RemoveDeadBindings(Store store, Stmt* Loc, const LiveVariables& Live,
                      llvm::SmallVectorImpl<const MemRegion*>& RegionRoots,

clang/lib/Analysis/BasicStore.cpp

@@ -48,6 +48,7 @@ public:
   }
 
   virtual RVal getLValue(const GRState* St, const Expr* Ex);
+  virtual RVal getLValue(const GRState* St, const ObjCIvarDecl* D, RVal Base);
   
   virtual Store
   RemoveDeadBindings(Store store, Stmt* Loc, const LiveVariables& Live,
@@ -154,6 +155,11 @@ RVal BasicStoreManager::GetRVal(Store St, LVal LV, QualType T) {
   return UnknownVal();
 }
 
+RVal BasicStoreManager::getLValue(const GRState* St, const ObjCIvarDecl* D,
+                                  RVal Base) {
+  return UnknownVal();  
+}
+  
 Store BasicStoreManager::SetRVal(Store store, LVal LV, RVal V) {    
   switch (LV.getSubKind()) {      
     case lval::MemRegionKind: {

clang/lib/Analysis/GRExprEngine.cpp

@@ -350,10 +350,13 @@ void GRExprEngine::Visit(Stmt* S, NodeTy* Pred, NodeSet& Dst) {
       break;
     }
       
-    case Stmt::MemberExprClass: {
+    case Stmt::MemberExprClass:
       VisitMemberExpr(cast<MemberExpr>(S), Pred, Dst, false);
       break;
-    }
+      
+    case Stmt::ObjCIvarRefExprClass:
+      VisitObjCIvarRefExpr(cast<ObjCIvarRefExpr>(S), Pred, Dst, false);
+      break;
       
     case Stmt::ObjCMessageExprClass: {
       VisitObjCMessageExpr(cast<ObjCMessageExpr>(S), Pred, Dst);
@@ -417,6 +420,10 @@ void GRExprEngine::VisitLValue(Expr* Ex, NodeTy* Pred, NodeSet& Dst) {
       VisitDeclRefExpr(cast<DeclRefExpr>(Ex), Pred, Dst, true);
       return;
       
+    case Stmt::ObjCIvarRefExprClass:
+      VisitObjCIvarRefExpr(cast<ObjCIvarRefExpr>(Ex), Pred, Dst, true);
+      return;
+      
     case Stmt::UnaryOperatorClass:
       VisitUnaryOperator(cast<UnaryOperator>(Ex), Pred, Dst, true);
       return;
@@ -1222,6 +1229,30 @@ void GRExprEngine::VisitCall(CallExpr* CE, NodeTy* Pred,
   }
 }
 
+//===----------------------------------------------------------------------===//
+// Transfer function: Objective-C ivar references.
+//===----------------------------------------------------------------------===//
+
+void GRExprEngine::VisitObjCIvarRefExpr(ObjCIvarRefExpr* Ex,
+                                            NodeTy* Pred, NodeSet& Dst,
+                                            bool asLValue) {
+  
+  Expr* Base = cast<Expr>(Ex->getBase());
+  NodeSet Tmp;
+  Visit(Base, Pred, Tmp);
+  
+  for (NodeSet::iterator I=Tmp.begin(), E=Tmp.end(); I!=E; ++I) {
+    const GRState* St = GetState(*I);
+    RVal BaseVal = GetRVal(St, Base);
+    RVal location = StateMgr.GetLValue(St, Ex->getDecl(), BaseVal);
+    
+    if (asLValue)
+      MakeNode(Dst, Ex, *I, SetRVal(St, Ex, location));
+    else
+      EvalLoad(Dst, Ex, *I, St, location);
+  }
+}
+
 //===----------------------------------------------------------------------===//
 // Transfer function: Objective-C message expressions.
 //===----------------------------------------------------------------------===//