Add "GetSValAsScalarOrLoc" methods to GRState/GRStateRef that only perform a

retrieval from the store/environment for locations or scalar types.

llvm-svn: 65982

1 files changed, 2 insertions, 2 deletions

diff --git a/clang/lib/Analysis/GRState.cpp b/clang/lib/Analysis/GRState.cpp
index eb6b1b5cfaa..85a85f207d8 100644
--- a/clang/lib/Analysis/GRState.cpp
+++ b/clang/lib/Analysis/GRState.cpp
@@ -257,7 +257,7 @@ bool ScanReachableSymbols::scan(SVal val) {
 }
   
 bool ScanReachableSymbols::scan(const MemRegion *R) {
-  if (visited.count(R))
+  if (isa<MemSpaceRegion>(R) || visited.count(R))
     return true;
   
   visited.insert(R);
@@ -273,7 +273,7 @@ bool ScanReachableSymbols::scan(const MemRegion *R) {
       return false;
   
   // Now look at the binding to this region (if any).
-  if (!scan(state.GetSVal(R)))
+  if (!scan(state.GetSValAsScalarOrLoc(R)))
     return false;
   
   // Now look at the subregions.