Auto hashing of ConstantEdgeFunction + EdgeFunctionComposer

Author: fabianbs96

include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h

@@ -96,6 +96,19 @@ operator<<(llvm::raw_ostream &OS, ByConstRef<ConstantEdgeFunction<L>> Id) {
   return OS;
 }
 
+template <typename L>
+  requires(is_std_hashable_v<typename NonTopBotValue<L>::type> ||
+           is_llvm_hashable_v<typename NonTopBotValue<L>::type>)
+[[nodiscard]] auto hash_value(const ConstantEdgeFunction<L> &CEF) noexcept {
+  using value_type = typename ConstantEdgeFunction<L>::value_type;
+  if constexpr (is_std_hashable_v<value_type>) {
+    return std::hash<value_type>{}(CEF.Value);
+  } else {
+    using llvm::hash_value;
+    return hash_value(CEF.Value);
+  }
+}
+
 template <typename L> struct AllBottom final {
   using l_t = L;
   using JLattice = JoinLatticeTraits<L>;
@@ -278,6 +291,11 @@ template <typename L> struct EdgeFunctionComposer {
 
 static_assert(HasDepth<EdgeFunctionComposer<int>>);
 
+template <typename L>
+auto hash_value(const EdgeFunctionComposer<L> &EFC) noexcept {
+  return llvm::hash_combine(EFC.First, EFC.Second);
+}
+
 template <typename L, uint8_t N> struct JoinEdgeFunction {
   using l_t = L;
   using JLattice = JoinLatticeTraits<L>;

lib/DataFlow/IfdsIde/IfdsIde.cppm

@@ -46,7 +46,6 @@ using psr::addSeedsForStartingPoints;
 using psr::AllTopFnProvider;
 using psr::checkSREquality;
 using psr::Compressor;
-using psr::ConstantEdgeFunction;
 using psr::defaultJoinOrNull;
 using psr::DefaultMapKeyCompressor;
 using psr::EdgeFunctionCache;

lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.cpp

@@ -66,17 +66,9 @@ struct LCAEdgeFunctionComposer : EdgeFunctionComposer<l_t> {
   }
 };
 
-auto hash_value(const LCAEdgeFunctionComposer &EF) noexcept {
-  return llvm::hash_combine(EF.First, EF.Second);
-}
-
 static_assert(is_llvm_hashable_v<LCAEdgeFunctionComposer>);
 
-struct GenConstant : ConstantEdgeFunction<l_t> {};
-
-llvm::hash_code hash_value(const GenConstant &EF) noexcept {
-  return llvm::hash_value(EF.Value);
-}
+using GenConstant = ConstantEdgeFunction<l_t>;
 
 using TTT = decltype(hash_value(std::declval<GenConstant>()));
 static_assert(is_llvm_hashable_v<GenConstant>);