reduce pitfalls

Author: pdschubert

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/SolverResults.h

@@ -19,6 +19,7 @@
 
 #include <map>
 #include <set>
+#include <type_traits>
 #include <unordered_map>
 
 #include <phasar/PhasarLLVM/Utils/BinaryDomain.h>
@@ -35,7 +36,7 @@ template <typename N, typename D, typename L> class SolverResults {
   SolverResults(Table<N, D, L> &res_tab, D zv)
       : results(res_tab), zeroValue(zv) {}
 
-  L valueAt(N stmt, D node) const { return results.get(stmt, node); }
+  L resultAt(N stmt, D node) const { return results.get(stmt, node); }
 
   std::unordered_map<D, L> resultsAt(N stmt, bool stripZero = false) const {
     std::unordered_map<D, L> result = results.row(stmt);
@@ -51,13 +52,18 @@ template <typename N, typename D, typename L> class SolverResults {
     return result;
   }
 
+  // this function only exists for IFDS problems which use BinaryDomain as their
+  // value domain L
+  template <typename ValueDomain = L,
+            typename = typename std::enable_if_t<
+                std::is_same_v<ValueDomain, BinaryDomain>>>
   std::set<D> ifdsResultsAt(N stmt) const {
-    std::set<D> keyset;
-    std::unordered_map<D, BinaryDomain> map = this->resultsAt(stmt);
-    for (auto d : map) {
-      keyset.insert(d.first);
+    std::set<D> KeySet;
+    std::unordered_map<D, BinaryDomain> ResultMap = this->resultsAt(stmt);
+    for (auto FlowFact : ResultMap) {
+      KeySet.insert(FlowFact.first);
     }
-    return keyset;
+    return KeySet;
   }
 };
 

include/phasar/Utils/BitVectorSet.h

@@ -209,6 +209,10 @@ template <typename T> class BitVectorSet {
     return !(Lhs == Rhs);
   }
 
+  friend bool operator<(const BitVectorSet &Lhs, const BitVectorSet &Rhs) {
+    return Lhs.Bits < Rhs.Bits;
+  }
+
   friend std::ostream &operator<<(std::ostream &OS, const BitVectorSet &B) {
     OS << '<';
     for (auto &Position : B.Position.left) {