[ADT, CSSPGO] Specify set comparer

[hvdijk]

Summary

In _GLIBCXX_DEBUG builds, potentially implicitly enabled by LLVM_ENABLE_EXPENSIVE_CHECKS, std::set<A, B>::iterator and std::set<A, C>::iterator are distinct types that are not interconvertible. This change aligns the iterator types with the set types.

For ADT, this was added by D112052. For CSSPGO, this was added by D99146. Adding the authors/reviewers of those revisions in case they want to suggest a different way of fixing this.

[hoy]

llvm/include/llvm/Transforms/IPO/ProfiledCallGraph.h

53–54

nit: using iterator = edges::iterator ?

[hvdijk]

Simplify ProfiledCallGraphNode's types by reusing earlier types.

[hvdijk]

llvm/include/llvm/Transforms/IPO/ProfiledCallGraph.h

53–54

Sure, and if we're doing that we can simplify edges at the same time by defining it using edge. Done.

[hoy]

LGTM, thanks for the fix.

llvm/include/llvm/ADT/EquivalenceClasses.h

const EquivalenceClasses &operator=(const EquivalenceClasses &RHS) {
     return *this;
   }
 
   //===--------------------------------------------------------------------===//
   // Inspection methods
   //
 
   /// iterator* - Provides a way to iterate over all values in the set.
-  using iterator = typename std::set<ECValue>::const_iterator;
+  using iterator =
+      typename std::set<ECValue, ECValueComparator>::const_iterator;
 
   iterator begin() const { return TheMapping.begin(); }
   iterator end() const { return TheMapping.end(); }
 
   bool empty() const { return TheMapping.empty(); }
 
   /// member_* Iterate over the members of an equivalence class.
   class member_iterator;

llvm/include/llvm/Transforms/IPO/ProfiledCallGraph.h

struct ProfiledCallGraphNode {
   // same caller. Edge weights are not considered either because for the same
   // callee only the edge with the largest weight is added to the edge set.
   struct ProfiledCallGraphEdgeComparer {
     bool operator()(const ProfiledCallGraphEdge &L,
                     const ProfiledCallGraphEdge &R) const {
       return L.Target->Name < R.Target->Name;
     }
   };
 
-  using iterator = std::set<ProfiledCallGraphEdge>::iterator;
-  using const_iterator = std::set<ProfiledCallGraphEdge>::const_iterator;
   using edge = ProfiledCallGraphEdge;
-  using edges = std::set<ProfiledCallGraphEdge, ProfiledCallGraphEdgeComparer>;
+  using edges = std::set<edge, ProfiledCallGraphEdgeComparer>;
+  using iterator = edges::iterator;
+  using const_iterator = edges::const_iterator;
 
   ProfiledCallGraphNode(StringRef FName = StringRef()) : Name(FName) {}
 
   StringRef Name;
   edges Edges;
 };
 
 class ProfiledCallGraph {
 public:
-  using iterator = std::set<ProfiledCallGraphEdge>::iterator;
+  using iterator = ProfiledCallGraphNode::iterator;
 
   // Constructor for non-CS profile.
   ProfiledCallGraph(SampleProfileMap &ProfileMap) {
     assert(!FunctionSamples::ProfileIsCSFlat &&
            "CS flat profile is not handled here");
     for (const auto &Samples : ProfileMap) {
       addProfiledCalls(Samples.second);
     }