allow further comparison operator for LatticeDomain

Author: pdschubert

include/phasar/PhasarLLVM/Utils/LatticeDomain.h

@@ -10,13 +10,15 @@
 #ifndef PHASAR_PHASARLLVM_UTILS_LATTICEDOMAIN_H
 #define PHASAR_PHASARLLVM_UTILS_LATTICEDOMAIN_H
 
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/raw_ostream.h"
-
 #include <iostream>
 #include <type_traits>
 #include <variant>
 
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+
+#include "phasar/Utils/TypeTraits.h"
+
 namespace psr {
 
 /// Represents the infimum of the lattice:
@@ -119,6 +121,17 @@ inline bool operator==(const LatticeDomain<L> Lhs, const LL &Rhs) {
   return Rhs == Lhs;
 }
 
+template <typename L, typename M>
+inline bool operator==(const L &Lhs, const M &Rhs) {
+  if constexpr (is_variant_v<L>) {
+    return Lhs == std::variant<M>(Rhs);
+  }
+  if constexpr (is_variant_v<M>) {
+    return std::variant<L>(Lhs) == Rhs;
+  }
+  return Lhs == Rhs;
+}
+
 template <typename L>
 inline bool operator!=(const LatticeDomain<L> &Lhs,
                        const LatticeDomain<L> &Rhs) {

include/phasar/Utils/TypeTraits.h

@@ -13,6 +13,7 @@
 #include <ostream>
 #include <tuple>
 #include <type_traits>
+#include <variant>
 
 #include "llvm/Support/raw_ostream.h"
 
@@ -109,6 +110,15 @@ constexpr bool is_std_hashable_v = detail::is_std_hashable<T>::value; // NOLINT
 template <typename T>
 constexpr bool is_llvm_hashable_v = // NOLINT
     detail::is_llvm_hashable<T>::value;
+
+template <typename T> struct is_variant : std::false_type {}; // NOLINT
+
+template <typename... Args>
+struct is_variant<std::variant<Args...>> : std::true_type {}; // NOLINT
+
+template <typename T>
+inline constexpr bool is_variant_v = is_variant<T>::value; // NOLINT
+
 // NOLINTEND(readability-identifier-naming)
 } // namespace psr
 

lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp

@@ -67,7 +67,7 @@ InterMonoSolverTest::callFlow(InterMonoSolverTest::n_t CallSite,
                               const InterMonoSolverTest::mono_container_t &In) {
   cout << "InterMonoSolverTest::callFlow()\n";
   InterMonoSolverTest::mono_container_t Result;
-  Result.setUnion(In);
+  Result = Result.setUnion(In);
   if (const auto *const Call = llvm::dyn_cast<llvm::CallInst>(CallSite)) {
     Result.insert(Call);
   }