revert r68457, its crashing in make check.

llvm-svn: 68459

2 files changed, 0 insertions, 20 deletions

diff --git a/llvm/examples/HowToUseJIT/HowToUseJIT.cpp b/llvm/examples/HowToUseJIT/HowToUseJIT.cpp
index b5c6d111914..0482df6248f 100644
--- a/llvm/examples/HowToUseJIT/HowToUseJIT.cpp
+++ b/llvm/examples/HowToUseJIT/HowToUseJIT.cpp
@@ -42,7 +42,6 @@
 #include "llvm/ExecutionEngine/JIT.h"
 #include "llvm/ExecutionEngine/Interpreter.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
-#include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
@@ -110,8 +109,5 @@ int main() {
 
   // Import result of execution:
   outs() << "Result: " << gv.IntVal << "\n";
-  EE->freeMachineCodeForFunction(FooF);
-  delete EE;
-  llvm_shutdown();
   return 0;
 }
diff --git a/llvm/lib/VMCore/Type.cpp b/llvm/lib/VMCore/Type.cpp
index f0ee04ae247..c14d5119e5d 100644
--- a/llvm/lib/VMCore/Type.cpp
+++ b/llvm/lib/VMCore/Type.cpp
@@ -666,22 +666,6 @@ protected:
   std::multimap<unsigned, PATypeHolder> TypesByHash;
 
 public:
-  ~TypeMapBase()
-  {
-    for (std::multimap<unsigned, PATypeHolder>::iterator I
-         = TypesByHash.begin(), E = TypesByHash.end(); I != E;) {
-      Type *Ty = I->second.get();
-      if (!Ty->isAbstract() && (isa<PointerType>(Ty) || isa<FunctionType>(Ty) ||
-                                isa<VectorType>(Ty))) {
-        TypesByHash.erase(I++);
-        // PATypeHolder won't destroy it, so we must
-        Ty->destroy();
-      }
-      else
-        ++I;
-    }
-  }
-
   void RemoveFromTypesByHash(unsigned Hash, const Type *Ty) {
     std::multimap<unsigned, PATypeHolder>::iterator I =
       TypesByHash.lower_bound(Hash);