[vmkit-commits] [vmkit] r196326 - cleanup includes

[Gael Thomas]

Author: gthomas
Date: Tue Dec  3 16:55:44 2013
New Revision: 196326

URL: http://llvm.org/viewvc/llvm-project?rev=196326&view=rev
Log:
cleanup includes

Modified:
    vmkit/branches/mcjit/include/j3/j3class.h
    vmkit/branches/mcjit/include/j3/j3classloader.h
    vmkit/branches/mcjit/lib/j3/vm/j3.cc
    vmkit/branches/mcjit/lib/j3/vm/j3class.cc
    vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc
    vmkit/branches/mcjit/lib/vmkit/vmkit.cc

Modified: vmkit/branches/mcjit/include/j3/j3class.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3class.h?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3class.h (original)
+++ vmkit/branches/mcjit/include/j3/j3class.h Tue Dec  3 16:55:44 2013
@@ -8,7 +8,6 @@
 #include "j3/j3symbol.h"
 
 namespace llvm {
-	class StructType;
 	class Type;
 	class GlobalValue;
 	class Module;

Modified: vmkit/branches/mcjit/include/j3/j3classloader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3classloader.h?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3classloader.h (original)
+++ vmkit/branches/mcjit/include/j3/j3classloader.h Tue Dec  3 16:55:44 2013
@@ -11,17 +11,6 @@
 
 #include "j3/j3object.h"
 
-namespace llvm {
-	class DataLayout;
-	class Type;
-	class Function;
-
-	namespace legacy {
-		class FunctionPassManager;
-	}
-	using legacy::FunctionPassManager;
-}
-
 namespace j3 {
 	class J3ZipArchive;
 	class J3ClassBytes;
@@ -50,7 +39,6 @@ namespace j3 {
 
 		J3ObjectHandle*                      _javaClassLoader;
 		J3FixedPoint                         _fixedPoint;
-		llvm::FunctionPassManager*           _pm;
 		pthread_mutex_t                      _mutex;       /* a lock */
 		vmkit::BumpAllocator*                _allocator;   /* the local allocator */
 		J3*                                  _vm;          /* my vm */
@@ -85,7 +73,6 @@ namespace j3 {
 
 		vmkit::BumpAllocator*         allocator() { return _allocator; }
 		J3*                           vm() const { return _vm; };
-		llvm::FunctionPassManager*    pm() { return _pm; }
 
 		J3Method*                     method(uint16_t access, J3Class* cl, 
 																				 const vmkit::Name* name, const vmkit::Name* sign); /* find a method ref */

Modified: vmkit/branches/mcjit/lib/j3/vm/j3.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3.cc?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Tue Dec  3 16:55:44 2013
@@ -8,12 +8,9 @@
 #include "j3/j3method.h"
 #include "j3/j3thread.h"
 
-#include "llvm/IR/Module.h"
 #include "llvm/IR/Type.h"
 #include "llvm/IR/DerivedTypes.h"
 
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-
 using namespace j3;
 
 vmkit::T_ptr_less_t<J3ObjectHandle*> J3::charArrayLess;

Modified: vmkit/branches/mcjit/lib/j3/vm/j3class.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3class.cc?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Tue Dec  3 16:55:44 2013
@@ -3,8 +3,6 @@
 #include <vector>
 
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/GenericValue.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/DataLayout.h"
 

Modified: vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3classloader.cc Tue Dec  3 16:55:44 2013
@@ -1,15 +1,6 @@
 #include <map>
 #include <dlfcn.h>
 
-#include "llvm/PassManager.h"
-#include "llvm/Linker.h"
-
-#include "llvm/ExecutionEngine/JIT.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/DerivedTypes.h"
-
 #include "vmkit/allocator.h"
 
 #include "j3/j3classloader.h"
@@ -242,8 +233,6 @@ bool J3ClassLoader::J3MethodLess::operat
 
 J3InitialClassLoader::J3InitialClassLoader(J3* v, const char* rtjar, vmkit::BumpAllocator* _alloc) 
 	: J3ClassLoader(v, 0, _alloc) {
-	llvm::llvm_start_multithreaded();
-
 	const char** archives = J3Lib::systemClassesArchives();
 	J3ClassBytes* bytes = J3Reader::openFile(allocator(), archives[0]);
 

Modified: vmkit/branches/mcjit/lib/vmkit/vmkit.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/vmkit.cc?rev=196326&r1=196325&r2=196326&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/vmkit.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/vmkit.cc Tue Dec  3 16:55:44 2013
@@ -32,6 +32,7 @@ using namespace vmkit;
 VMKit::VMKit(vmkit::BumpAllocator* allocator) :
 	mangleMap(Util::char_less, allocator) {
 	llvm::InitializeNativeTarget();
+	llvm::llvm_start_multithreaded();
 	_allocator = allocator;
 }