fixup! Move std::set into SelectionDAG instead of reusing FoldingSet.

Author: topperc

llvm/include/llvm/CodeGen/SelectionDAG.h

@@ -44,6 +44,7 @@
 #include <cstdint>
 #include <functional>
 #include <map>
+#include <set>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -247,6 +248,9 @@ class SelectionDAG {
   BlockFrequencyInfo *BFI = nullptr;
   MachineModuleInfo *MMI = nullptr;
 
+  /// Extended EVTs used for single value VTLists.
+  std::set<EVT, EVT::compareRawBits> EVTs;
+
   /// List of non-single value types.
   FoldingSet<SDVTListNode> VTListMap;
 

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

@@ -10626,19 +10626,7 @@ SDVTList SelectionDAG::getVTList(EVT VT) {
   if (!VT.isExtended())
     return makeVTList(SDNode::getValueTypeList(VT.getSimpleVT()), 1);
 
-  FoldingSetNodeID ID;
-  ID.AddInteger(1U);
-  ID.AddInteger(VT.getRawBits());
-
-  void *IP = nullptr;
-  SDVTListNode *Result = VTListMap.FindNodeOrInsertPos(ID, IP);
-  if (!Result) {
-    EVT *Array = Allocator.Allocate<EVT>(1);
-    Array[0] = VT;
-    Result = new (Allocator) SDVTListNode(ID.Intern(Allocator), Array, 1);
-    VTListMap.InsertNode(Result, IP);
-  }
-  return Result->getSDVTList();
+  return makeVTList(&(*EVTs.insert(VT).first), 1);
 }
 
 SDVTList SelectionDAG::getVTList(EVT VT1, EVT VT2) {