1 files changed, 44 insertions, 10 deletions

diff --git a/include/clang/Analysis/PathSensitive/SValuator.h b/include/clang/Analysis/PathSensitive/SValuator.h
index 490c04e5978e9..e63eb12cf8ea8 100644
--- a/include/clang/Analysis/PathSensitive/SValuator.h
+++ b/include/clang/Analysis/PathSensitive/SValuator.h
@@ -9,7 +9,7 @@
 //
 //  This file defines SValuator, a class that defines the interface for
 //  "symbolical evaluators" which construct an SVal from an expression.
-//  
+//
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_ANALYSIS_SVALUATOR
@@ -24,32 +24,66 @@ class GRState;
 class ValueManager;
 
 class SValuator {
+  friend class ValueManager;
 protected:
   ValueManager &ValMgr;
-  
+
+  virtual SVal EvalCastNL(NonLoc val, QualType castTy) = 0;
+
+  virtual SVal EvalCastL(Loc val, QualType castTy) = 0;
+
 public:
   SValuator(ValueManager &valMgr) : ValMgr(valMgr) {}
   virtual ~SValuator() {}
+
+  template <typename T>
+  class GenericCastResult : public std::pair<const GRState *, T> {
+  public:
+    const GRState *getState() const { return this->first; }
+    T getSVal() const { return this->second; }
+    GenericCastResult(const GRState *s, T v)
+      : std::pair<const GRState*,T>(s, v) {}
+  };
   
-  virtual SVal EvalCast(NonLoc val, QualType castTy) = 0;  
+  class CastResult : public GenericCastResult<SVal> {
+  public:
+    CastResult(const GRState *s, SVal v) : GenericCastResult<SVal>(s, v) {}
+  };
+  
+  class DefinedOrUnknownCastResult :
+    public GenericCastResult<DefinedOrUnknownSVal> {
+  public:
+    DefinedOrUnknownCastResult(const GRState *s, DefinedOrUnknownSVal v)
+      : GenericCastResult<DefinedOrUnknownSVal>(s, v) {}
+  };
 
-  virtual SVal EvalCast(Loc val, QualType castTy) = 0;
+  CastResult EvalCast(SVal V, const GRState *ST,
+                      QualType castTy, QualType originalType);
   
+  DefinedOrUnknownCastResult EvalCast(DefinedOrUnknownSVal V, const GRState *ST,
+                                      QualType castTy, QualType originalType);
+
   virtual SVal EvalMinus(NonLoc val) = 0;
-  
+
   virtual SVal EvalComplement(NonLoc val) = 0;
 
-  virtual SVal EvalBinOpNN(BinaryOperator::Opcode Op, NonLoc lhs,
-                           NonLoc rhs, QualType resultTy) = 0;
+  virtual SVal EvalBinOpNN(const GRState *state, BinaryOperator::Opcode Op,
+                           NonLoc lhs, NonLoc rhs, QualType resultTy) = 0;
 
   virtual SVal EvalBinOpLL(BinaryOperator::Opcode Op, Loc lhs, Loc rhs,
                            QualType resultTy) = 0;
 
   virtual SVal EvalBinOpLN(const GRState *state, BinaryOperator::Opcode Op,
-                           Loc lhs, NonLoc rhs, QualType resultTy) = 0;  
-};
+                           Loc lhs, NonLoc rhs, QualType resultTy) = 0;
   
-SValuator* CreateSimpleSValuator(ValueManager &valMgr);
+  SVal EvalBinOp(const GRState *ST, BinaryOperator::Opcode Op,
+                 SVal L, SVal R, QualType T);
   
+  DefinedOrUnknownSVal EvalEQ(const GRState *ST, DefinedOrUnknownSVal L,
+                              DefinedOrUnknownSVal R);
+};
+
+SValuator* CreateSimpleSValuator(ValueManager &valMgr);
+
 } // end clang namespace
 #endif