Take first step to migrating handling of "stores" to values from GRExprEngine

to the plug-in GRTransferFuncs object.

llvm-svn: 49801

1 files changed, 8 insertions, 3 deletions

diff --git a/clang/lib/Analysis/GRExprEngine.cpp b/clang/lib/Analysis/GRExprEngine.cpp
index dfe319f0c95..9c6a37dbadf 100644
--- a/clang/lib/Analysis/GRExprEngine.cpp
+++ b/clang/lib/Analysis/GRExprEngine.cpp
@@ -1637,8 +1637,11 @@ void GRExprEngine::VisitBinaryOperator(BinaryOperator* B,
           // Simulate the effects of a "store":  bind the value of the RHS
           // to the L-Value represented by the LHS.
 
-          St = SetRVal(SetRVal(St, B, RightV), cast<LVal>(LeftV), RightV);
-          break;
+          EvalStore(Dst, B, N2, SetRVal(St, B, RightV),
+                    cast<LVal>(LeftV), RightV);
+          
+//          St = SetRVal(SetRVal(St, B, RightV), cast<LVal>(LeftV), RightV);
+          continue;
         }
 
           // Compound assignment operators.
@@ -1784,7 +1787,9 @@ void GRExprEngine::VisitBinaryOperator(BinaryOperator* B,
             continue;
           }
           
-          St = SetRVal(SetRVal(St, B, Result), LeftLV, Result);
+          //          St = SetRVal(SetRVal(St, B, Result), LeftLV, Result);          
+          EvalStore(Dst, B, N2, SetRVal(St, B, Result), LeftLV, Result);
+          continue;
         }
       }