For PR950:

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

diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp
index a6d96df7ba1f18d4b723759d9e4ccdde9b95bafc..39715fe48ceb6a6e12180122a198dd3d049ccc73 100644 (file)
--- a/lib/VMCore/LeakDetector.cpp
+++ b/lib/VMCore/LeakDetector.cpp
@@ -1,25 +1,36 @@
 //===-- LeakDetector.cpp - Implement LeakDetector interface ---------------===//
-// 
+//
 //                     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 implements the LeakDetector class.
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Value.h"
+#include <iostream>
 #include <set>
 using namespace llvm;
 
 namespace {
+  template <class T>
+  struct VISIBILITY_HIDDEN PrinterTrait {
+    static void print(const T* P) { std::cerr << P; }
+  };
+
+  template<>
+  struct VISIBILITY_HIDDEN PrinterTrait<Value> {
+    static void print(const Value* P) { std::cerr << *P; }
+  };
 
   template <typename T>
-  struct LeakDetectorImpl {
+  struct VISIBILITY_HIDDEN LeakDetectorImpl {
     LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
 
     // Because the most common usage pattern, by far, is to add a
@@ -39,7 +50,7 @@ namespace {
       if (o == Cache)
         Cache = 0; // Cache hit
       else
-          Ts.erase(o);
+        Ts.erase(o);
     }
 
     bool hasGarbage(const std::string& Message) {
@@ -49,14 +60,15 @@ namespace {
 
       if (!Ts.empty()) {
         std::cerr
-            << "Leaked " << Name << " objects found: " << Message << ":\n\t";
-        std::copy(Ts.begin(), Ts.end(),
-                  std::ostream_iterator<const T*>(std::cerr, " "));
+            << "Leaked " << Name << " objects found: " << Message << ":\n";
+        for (typename std::set<const T*>::iterator I = Ts.begin(),
+               E = Ts.end(); I != E; ++I) {
+          std::cerr << "\t";
+          PrinterTrait<T>::print(*I);
+          std::cerr << "\n";
+        }
         std::cerr << '\n';
 
-        // Clear out results so we don't get duplicate warnings on
-        // next call...
-        Ts.clear();
         return true;
       }
       return false;
@@ -64,21 +76,30 @@ namespace {
 
   private:
     std::set<const T*> Ts;
-      const T* Cache;
-      const char* const Name;
+    const T* Cache;
+    const char* const Name;
   };
 
-  typedef LeakDetectorImpl<void>  Objects;
-  typedef LeakDetectorImpl<Value> LLVMObjects;
+  LeakDetectorImpl<void>  *Objects;
+  LeakDetectorImpl<Value> *LLVMObjects;
+
+  LeakDetectorImpl<void> &getObjects() {
+    if (Objects == 0)
+      Objects = new LeakDetectorImpl<void>("GENERIC");
+    return *Objects;
+  }
 
-  Objects& getObjects() {
-    static Objects o("GENERIC");
-    return o;
+  LeakDetectorImpl<Value> &getLLVMObjects() {
+    if (LLVMObjects == 0)
+      LLVMObjects = new LeakDetectorImpl<Value>("LLVM");
+    return *LLVMObjects;
   }
 
-  LLVMObjects& getLLVMObjects() {
-    static LLVMObjects o("LLVM");
-    return o;
+  void clearGarbage() {
+    delete Objects;
+    delete LLVMObjects;
+    Objects = 0;
+    LLVMObjects = 0;
   }
 }
 
@@ -104,4 +125,8 @@ void LeakDetector::checkForGarbageImpl(const std::string &Message) {
       getLLVMObjects().hasGarbage(Message))
     std::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...
+  clearGarbage();
 }