diff options
Diffstat (limited to 'lib/Checker/GRState.cpp')
| -rw-r--r-- | lib/Checker/GRState.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Checker/GRState.cpp b/lib/Checker/GRState.cpp index c533dceee5..592f930316 100644 --- a/lib/Checker/GRState.cpp +++ b/lib/Checker/GRState.cpp @@ -69,7 +69,7 @@ const GRState *GRState::unbindLoc(Loc LV) const { return getStateManager().getPersistentState(NewSt); } -SVal GRState::LoadAsScalarOrLoc(const MemRegion *R) const { +SVal GRState::getSValAsScalarOrLoc(const MemRegion *R) const { // We only want to do fetches from regions that we can actually bind // values. For example, SymbolicRegions of type 'id<...>' cannot // have direct bindings (but their can be bindings on their subregions). @@ -79,7 +79,7 @@ SVal GRState::LoadAsScalarOrLoc(const MemRegion *R) const { if (const TypedRegion *TR = dyn_cast<TypedRegion>(R)) { QualType T = TR->getValueType(getStateManager().getContext()); if (Loc::IsLocType(T) || T->isIntegerType()) - return Load(R); + return getSVal(R); } return UnknownVal(); @@ -297,7 +297,7 @@ bool ScanReachableSymbols::scan(const MemRegion *R) { return false; // Now look at the binding to this region (if any). - if (!scan(state->LoadAsScalarOrLoc(R))) + if (!scan(state->getSValAsScalarOrLoc(R))) return false; // Now look at the subregions. @@ -341,7 +341,7 @@ bool GRState::scanReachableSymbols(const MemRegion * const *I, bool GRStateManager::isEqual(const GRState* state, const Expr* Ex, const llvm::APSInt& Y) { - SVal V = state->getExprVal(Ex); + SVal V = state->getSVal(Ex); if (loc::ConcreteInt* X = dyn_cast<loc::ConcreteInt>(&V)) return X->getValue() == Y; |