Revert 95541.

llvm-svn: 95545
diff --git a/clang/lib/Checker/NSErrorChecker.cpp b/clang/lib/Checker/NSErrorChecker.cpp
index 7e680a6..e428e2e 100644
--- a/clang/lib/Checker/NSErrorChecker.cpp
+++ b/clang/lib/Checker/NSErrorChecker.cpp
@@ -199,7 +199,7 @@
   SVal ParamL = rootState->getLValue(Param, LC);
   const MemRegion* ParamR = cast<loc::MemRegionVal>(ParamL).getRegionAs<VarRegion>();
   assert (ParamR && "Parameters always have VarRegions.");
-  SVal ParamSVal = rootState->Load(ParamR);
+  SVal ParamSVal = rootState->getSVal(ParamR);
 
   // FIXME: For now assume that ParamSVal is symbolic.  We need to generalize
   // this later.
@@ -212,8 +212,7 @@
   llvm::tie(I, E) = GetImplicitNullDereferences(Eng);
   for ( ; I != E; ++I) {
     const GRState *state = (*I)->getState();
-    SVal location =
-      state->getExprVal((*I)->getLocationAs<StmtPoint>()->getStmt());
+    SVal location = state->getSVal((*I)->getLocationAs<StmtPoint>()->getStmt());
     if (location.getAsSymbol() != ParamSym)
       continue;