diff options
| -rw-r--r-- | Analysis/DataflowSolver.h | 6 | ||||
| -rw-r--r-- | include/clang/Analysis/UninitializedValues.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Analysis/DataflowSolver.h b/Analysis/DataflowSolver.h index b89b45b677..d5e5bbbe80 100644 --- a/Analysis/DataflowSolver.h +++ b/Analysis/DataflowSolver.h @@ -16,6 +16,7 @@ #include "clang/AST/CFG.h" #include "llvm/ADT/SmallPtrSet.h" +#include "functional" // STL namespace clang { @@ -47,7 +48,8 @@ public: /// DataflowSolverTy - Generic dataflow solver. template <typename _DFValuesTy, // Usually a subclass of DataflowValues typename _TransferFuncsTy, - typename _MergeOperatorTy > + typename _MergeOperatorTy, + typename _Equal = std::equal_to<typename _DFValuesTy::ValTy> > class DataflowSolver { //===--------------------------------------------------------------------===// @@ -228,7 +230,7 @@ private: M[E].copyValues(V); WorkList.enqueue(TargetBlock); } - else if (!(V==I->second)) { + else if (!_Equal()(V,I->second)) { I->second.copyValues(V); WorkList.enqueue(TargetBlock); } diff --git a/include/clang/Analysis/UninitializedValues.h b/include/clang/Analysis/UninitializedValues.h index d116da595c..21e1ebd447 100644 --- a/include/clang/Analysis/UninitializedValues.h +++ b/include/clang/Analysis/UninitializedValues.h @@ -71,7 +71,7 @@ public: ExprBV.reset(); } - bool operator==(ValTy& RHS) const { + bool operator==(const ValTy& RHS) const { return DeclBV == RHS.DeclBV && ExprBV == RHS.ExprBV; } |