rename 'Result' to 'OS' in CalcTypeName for consistency

[oota-llvm.git] / lib / VMCore / LeakDetector.cpp

diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp
index 4c9f12580724e9cd01dfcc5fc840f4ca2d50f533..1bf9171553837c7fc0e8d0aaa78d9908c2fa9f08 100644 (file)
--- a/lib/VMCore/LeakDetector.cpp
+++ b/lib/VMCore/LeakDetector.cpp
@@ -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.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -11,27 +11,27 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/Compiler.h"
 #include "llvm/Support/LeakDetector.h"
+#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/Value.h"
-#include <set>
 using namespace llvm;
 
 namespace {
   template <class T>
   struct VISIBILITY_HIDDEN PrinterTrait {
-    static void print(const T* P) { llvm_cerr << P; }
+    static void print(const T* P) { cerr << P; }
   };
 
   template<>
   struct VISIBILITY_HIDDEN PrinterTrait<Value> {
-    static void print(const Value* P) { llvm_cerr << *P; }
+    static void print(const Value* P) { cerr << *P; }
   };
 
   template <typename T>
   struct VISIBILITY_HIDDEN LeakDetectorImpl {
-    LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
+    explicit LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
 
     // Because the most common usage pattern, by far, is to add a
     // garbage object, then remove it immediately, we optimize this
@@ -59,15 +59,14 @@ namespace {
       assert(Cache == 0 && "No value should be cached anymore!");
 
       if (!Ts.empty()) {
-        llvm_cerr
-            << "Leaked " << Name << " objects found: " << Message << ":\n";
-        for (typename std::set<const T*>::iterator I = Ts.begin(),
+        cerr << "Leaked " << Name << " objects found: " << Message << ":\n";
+        for (typename SmallPtrSet<const T*, 8>::iterator I = Ts.begin(),
                E = Ts.end(); I != E; ++I) {
-          llvm_cerr << "\t";
+          cerr << "\t";
           PrinterTrait<T>::print(*I);
-          llvm_cerr << "\n";
+          cerr << "\n";
         }
-        llvm_cerr << '\n';
+        cerr << '\n';
 
         return true;
       }
@@ -75,27 +74,27 @@ namespace {
     }
 
   private:
-    std::set<const T*> Ts;
+    SmallPtrSet<const T*, 8> Ts;
     const T* Cache;
     const char* const Name;
   };
 
-  LeakDetectorImpl<void>  *Objects;
-  LeakDetectorImpl<Value> *LLVMObjects;
+  static LeakDetectorImpl<void>  *Objects;
+  static LeakDetectorImpl<Value> *LLVMObjects;
 
-  LeakDetectorImpl<void> &getObjects() {
+  static LeakDetectorImpl<void> &getObjects() {
     if (Objects == 0)
       Objects = new LeakDetectorImpl<void>("GENERIC");
     return *Objects;
   }
 
-  LeakDetectorImpl<Value> &getLLVMObjects() {
+  static LeakDetectorImpl<Value> &getLLVMObjects() {
     if (LLVMObjects == 0)
       LLVMObjects = new LeakDetectorImpl<Value>("LLVM");
     return *LLVMObjects;
   }
 
-  void clearGarbage() {
+  static void clearGarbage() {
     delete Objects;
     delete LLVMObjects;
     Objects = 0;
@@ -123,8 +122,8 @@ void LeakDetector::checkForGarbageImpl(const std::string &Message) {
   // use non-short-circuit version so that both checks are performed
   if (getObjects().hasGarbage(Message) |
       getLLVMObjects().hasGarbage(Message))
-    llvm_cerr << "\nThis is probably because you removed an object, but didn't "
-              << "delete it.  Please check your code for memory leaks.\n";
+    cerr << "\nThis is probably because you removed an object, but didn't "
+         << "delete it.  Please check your code for memory leaks.\n";
 
   // Clear out results so we don't get duplicate warnings on
   // next call...