diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 2108717c5b6..41050211b2e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -6344,8 +6344,8 @@ bool ShuffleVectorSDNode::isSplatMask(const int *Mask, EVT VT) {
 }
 
 static void checkForCyclesHelper(const SDNode *N,
-                                 SmallPtrSet<const SDNode *, 32> &visited,
-                                 SmallPtrSet<const SDNode *, 32> &checked) {
+                                 std::set<const SDNode *> &visited,
+                                 std::set<const SDNode *> &checked) {
   if (checked.find(N) != checked.end())
     return;
 
@@ -6371,8 +6371,8 @@ static void checkForCyclesHelper(const SDNode *N,
 void llvm::checkForCycles(const llvm::SDNode *N) {
 #ifdef XDEBUG
   assert(N && "Checking nonexistant SDNode");
-  SmallPtrSet<const SDNode *, 32> visited;
-  SmallPtrSet<const SDNode *, 32> checked;
+  std::set<const SDNode *> visited;
+  std::set<const SDNode *> checked;
   checkForCyclesHelper(N, visited, checked);
 #endif
 }