diff options
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRState.h | 20 | ||||
| -rw-r--r-- | include/clang/Analysis/PathSensitive/Store.h | 18 |
2 files changed, 16 insertions, 22 deletions
diff --git a/include/clang/Analysis/PathSensitive/GRState.h b/include/clang/Analysis/PathSensitive/GRState.h index f4224e4b09..d8b9d560cc 100644 --- a/include/clang/Analysis/PathSensitive/GRState.h +++ b/include/clang/Analysis/PathSensitive/GRState.h @@ -243,10 +243,10 @@ public: SVal getLValue(const ObjCIvarDecl *decl, SVal base) const; /// Get the lvalue for a field reference. - SVal getLValue(SVal Base, const FieldDecl *decl) const; + SVal getLValue(const FieldDecl *decl, SVal Base) const; /// Get the lvalue for an array index. - SVal getLValue(QualType ElementType, SVal Base, SVal Idx) const; + SVal getLValue(QualType ElementType, SVal Idx, SVal Base) const; const llvm::APSInt *getSymVal(SymbolRef sym) const; @@ -623,27 +623,27 @@ inline const GRState *GRState::bindLoc(SVal LV, SVal V) const { inline SVal GRState::getLValue(const VarDecl* VD, const LocationContext *LC) const { - return getStateManager().StoreMgr->getLValueVar(this, VD, LC); + return getStateManager().StoreMgr->getLValueVar(VD, LC); } inline SVal GRState::getLValue(const StringLiteral *literal) const { - return getStateManager().StoreMgr->getLValueString(this, literal); + return getStateManager().StoreMgr->getLValueString(literal); } inline SVal GRState::getLValue(const CompoundLiteralExpr *literal) const { - return getStateManager().StoreMgr->getLValueCompoundLiteral(this, literal); + return getStateManager().StoreMgr->getLValueCompoundLiteral(literal); } inline SVal GRState::getLValue(const ObjCIvarDecl *D, SVal Base) const { - return getStateManager().StoreMgr->getLValueIvar(this, D, Base); + return getStateManager().StoreMgr->getLValueIvar(D, Base); } -inline SVal GRState::getLValue(SVal Base, const FieldDecl* D) const { - return getStateManager().StoreMgr->getLValueField(this, Base, D); +inline SVal GRState::getLValue(const FieldDecl* D, SVal Base) const { + return getStateManager().StoreMgr->getLValueField(D, Base); } -inline SVal GRState::getLValue(QualType ElementType, SVal Base, SVal Idx) const{ - return getStateManager().StoreMgr->getLValueElement(this, ElementType, Base, Idx); +inline SVal GRState::getLValue(QualType ElementType, SVal Idx, SVal Base) const{ + return getStateManager().StoreMgr->getLValueElement(ElementType, Idx, Base); } inline const llvm::APSInt *GRState::getSymVal(SymbolRef sym) const { diff --git a/include/clang/Analysis/PathSensitive/Store.h b/include/clang/Analysis/PathSensitive/Store.h index c9713c0b36..ed2da1a59a 100644 --- a/include/clang/Analysis/PathSensitive/Store.h +++ b/include/clang/Analysis/PathSensitive/Store.h @@ -89,23 +89,17 @@ public: // caller's responsibility to 'delete' the returned map. virtual SubRegionMap *getSubRegionMap(const GRState *state) = 0; - virtual SVal getLValueVar(const GRState *ST, const VarDecl *VD, - const LocationContext *LC) = 0; + virtual SVal getLValueVar(const VarDecl *VD, const LocationContext *LC) = 0; - virtual SVal getLValueString(const GRState *state, - const StringLiteral* sl) = 0; + virtual SVal getLValueString(const StringLiteral* sl) = 0; - virtual SVal getLValueCompoundLiteral(const GRState *state, - const CompoundLiteralExpr* cl) = 0; + virtual SVal getLValueCompoundLiteral(const CompoundLiteralExpr* cl) = 0; - virtual SVal getLValueIvar(const GRState *state, const ObjCIvarDecl* decl, - SVal base) = 0; + virtual SVal getLValueIvar(const ObjCIvarDecl* decl, SVal base) = 0; - virtual SVal getLValueField(const GRState *state, SVal base, - const FieldDecl* D) = 0; + virtual SVal getLValueField(const FieldDecl* D, SVal Base) = 0; - virtual SVal getLValueElement(const GRState *state, QualType elementType, - SVal base, SVal offset) = 0; + virtual SVal getLValueElement(QualType elementType, SVal offset, SVal Base)=0; // FIXME: Make out-of-line. virtual SVal getSizeInElements(const GRState *state, const MemRegion *region){ |