Enhance modularization: return a <state,loc> pair to let GRExprEngine modify the

environment.

llvm-svn: 59407

1 files changed, 6 insertions, 2 deletions

diff --git a/clang/lib/Analysis/GRExprEngine.cpp b/clang/lib/Analysis/GRExprEngine.cpp
index e002c136372..fe7d6f94266 100644
--- a/clang/lib/Analysis/GRExprEngine.cpp
+++ b/clang/lib/Analysis/GRExprEngine.cpp
@@ -1698,11 +1698,15 @@ void GRExprEngine::VisitCast(Expr* CastE, Expr* Ex, NodeTy* Pred, NodeSet& Dst){
       assert(Loc::IsLocType(ExTy));
 
       // Delegate to store manager.
-      const GRState* NewSt = getStoreManager().CastRegion(St, V, T, CastE);
+      std::pair<const GRState*, SVal> Res =  
+        getStoreManager().CastRegion(St, V, T, CastE);
+
+      const GRState* NewSt = Res.first;
+      SVal NewPtr = Res.second;
 
       // If no new region is created, fall through to the default case.
       if (NewSt != St) {
-        MakeNode(Dst, CastE, N, NewSt);
+        MakeNode(Dst, CastE, N, BindExpr(NewSt, CastE, NewPtr));
         continue;
       }
     }