Customize ClangDeclId instead of customizing ClangDecl hashing and equality

toolchain/base/value_store.h

@@ -267,6 +267,9 @@ class CanonicalValueStore {
   Set<IdT, /*SmallSize=*/0, KeyContext> set_;
 };
 
+template <typename T>
+concept HasTranslateValueToKey = requires { &T::TranslateValueToKey; };
+
 template <typename IdT>
 class CanonicalValueStore<IdT>::KeyContext
     : public TranslatingKeyContext<KeyContext> {
@@ -275,8 +278,18 @@ class CanonicalValueStore<IdT>::KeyContext
 
   // Note that it is safe to return a `const` reference here as the underlying
   // object's lifetime is provided by the `ValueStore`.
-  auto TranslateKey(IdT id) const -> ValueStore<IdT>::ConstRefType {
-    return values_->Get(id);
+  auto TranslateKey(IdT id) const {
+    if constexpr (requires { IdT::TranslateValueToKey(values_->Get(id)); }) {
+      return IdT::TranslateValueToKey(values_->Get(id));
+    } else {
+      return values_->Get(id);
+    }
+  }
+
+  auto TranslateKey(ValueType value) const
+    requires HasTranslateValueToKey<IdT>
+  {
+    return IdT::TranslateValueToKey(value);
   }
 
  private:

toolchain/sem_ir/clang_decl.h

@@ -28,17 +28,6 @@ namespace Carbon::SemIR {
 struct ClangDecl : public Printable<ClangDecl> {
   auto Print(llvm::raw_ostream& out) const -> void;
 
-  friend auto CarbonHashtableEq(const ClangDecl& lhs, const ClangDecl& rhs)
-      -> bool {
-    return HashtableEq(lhs.decl, rhs.decl);
-  }
-
-  // Hashing for ClangDecl. See common/hashing.h.
-  friend auto CarbonHashValue(const ClangDecl& value, uint64_t seed)
-      -> HashCode {
-    return HashValue(value.decl, seed);
-  }
-
   // The Clang declaration pointing to the Clang AST.
   // TODO: Ensure we can easily serialize/deserialize this. Consider
   // `clang::LazyDeclPtr`.
@@ -53,6 +42,9 @@ struct ClangDeclId : public IdBase<ClangDeclId> {
   static constexpr llvm::StringLiteral Label = "clang_decl_id";
 
   using ValueType = ClangDecl;
+  static auto TranslateValueToKey(const ValueType& value) -> clang::Decl* {
+    return value.decl;
+  }
 
   using IdBase::IdBase;
 };