Fix for PR3946, in which SmallVector could behave strangely in corner cases.

[oota-llvm.git] / include / llvm / ADT / SCCIterator.h

diff --git a/include/llvm/ADT/SCCIterator.h b/include/llvm/ADT/SCCIterator.h
index 050353d20dbab3fe4dac77f2bbc51af039c3205e..e28f4caa5d76993668b45eacb9fc8de76e8ad839 100644 (file)
--- a/include/llvm/ADT/SCCIterator.h
+++ b/include/llvm/ADT/SCCIterator.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -22,9 +22,9 @@
 #define LLVM_ADT_SCCITERATOR_H
 
 #include "llvm/ADT/GraphTraits.h"
-#include "llvm/ADT/iterator"
-#include <vector>
+#include "llvm/ADT/iterator.h"
 #include <map>
+#include <vector>
 
 namespace llvm {
 
@@ -71,8 +71,8 @@ class scc_iterator
     SCCNodeStack.push_back(N);
     MinVisitNumStack.push_back(visitNum);
     VisitStack.push_back(std::make_pair(N, GT::child_begin(N)));
-    //DEBUG(std::cerr << "TarjanSCC: Node " << N <<
-    //      " : visitNum = " << visitNum << "\n");
+    //DOUT << "TarjanSCC: Node " << N <<
+    //      " : visitNum = " << visitNum << "\n";
   }
 
   // The stack-based DFS traversal; defined below.
@@ -106,9 +106,9 @@ class scc_iterator
       if (!MinVisitNumStack.empty() && MinVisitNumStack.back() > minVisitNum)
         MinVisitNumStack.back() = minVisitNum;
 
-      //DEBUG(std::cerr << "TarjanSCC: Popped node " << visitingN <<
+      //DOUT << "TarjanSCC: Popped node " << visitingN <<
       //      " : minVisitNum = " << minVisitNum << "; Node visit num = " <<
-      //      nodeVisitNumbers[visitingN] << "\n");
+      //      nodeVisitNumbers[visitingN] << "\n";
 
       if (minVisitNum == nodeVisitNumbers[visitingN]) {
         // A full SCC is on the SCCNodeStack!  It includes all nodes below
@@ -118,7 +118,7 @@ class scc_iterator
           do {
             CurrentSCC.push_back(SCCNodeStack.back());
             SCCNodeStack.pop_back();
-            nodeVisitNumbers[CurrentSCC.back()] = ~0UL;
+            nodeVisitNumbers[CurrentSCC.back()] = ~0U;
           } while (CurrentSCC.back() != visitingN);
           return;
         }