Revert 95541.

llvm-svn: 95545
diff --git a/clang/lib/Checker/BugReporterVisitors.cpp b/clang/lib/Checker/BugReporterVisitors.cpp
index 31a2e65..b8f657b 100644
--- a/clang/lib/Checker/BugReporterVisitors.cpp
+++ b/clang/lib/Checker/BugReporterVisitors.cpp
@@ -113,7 +113,7 @@
               }
         }
 
-        if (Node->getState()->Load(R) != V)
+        if (Node->getState()->getSVal(R) != V)
           break;
       }
 
@@ -319,7 +319,7 @@
       StateMgr.getRegionManager().getVarRegion(VD, N->getLocationContext());
 
       // What did we load?
-      SVal V = state->getExprVal(S);
+      SVal V = state->getSVal(S);
 
       if (isa<loc::ConcreteInt>(V) || isa<nonloc::ConcreteInt>(V)
           || V.isUndef()) {
@@ -328,7 +328,7 @@
     }
   }
 
-  SVal V = state->getExprValAsScalarOrLoc(S);
+  SVal V = state->getSValAsScalarOrLoc(S);
 
   // Uncomment this to find cases where we aren't properly getting the
   // base value that was dereferenced.