Bug fixes for PR341
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14838 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/ConstantRange.cpp b/lib/Support/ConstantRange.cpp
index 580ca01..3b91c5b 100644
--- a/lib/Support/ConstantRange.cpp
+++ b/lib/Support/ConstantRange.cpp
@@ -322,7 +322,7 @@
/// print - Print out the bounds to a stream...
///
void ConstantRange::print(std::ostream &OS) const {
- OS << "[" << Lower << "," << Upper << " )";
+ OS << "[" << *Lower << "," << *Upper << " )";
}
/// dump - Allow printing from a debugger easily...
diff --git a/lib/Support/LeakDetector.cpp b/lib/Support/LeakDetector.cpp
index 919f7a9..dbdb7dd 100644
--- a/lib/Support/LeakDetector.cpp
+++ b/lib/Support/LeakDetector.cpp
@@ -18,6 +18,16 @@
using namespace llvm;
namespace {
+ template <class T>
+ struct PrinterTrait {
+ static void print(const T* P) { std::cerr << P; }
+ };
+
+ template<>
+ struct PrinterTrait<Value> {
+ static void print(const Value* P) { std::cerr << *P; }
+ };
+
template <typename T>
struct LeakDetectorImpl {
LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
@@ -39,7 +49,7 @@
if (o == Cache)
Cache = 0; // Cache hit
else
- Ts.erase(o);
+ Ts.erase(o);
}
bool hasGarbage(const std::string& Message) {
@@ -49,9 +59,13 @@
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