Port SwiftShader to LLVM 7.0

src/Reactor/LLVMRoutine.cpp

@@ -20,6 +20,7 @@
 
 namespace sw
 {
+#if SWIFTSHADER_LLVM_VERSION < 7
 	LLVMRoutine::LLVMRoutine(int bufferSize) : bufferSize(bufferSize)
 	{
 		void *memory = allocateExecutable(bufferSize);
@@ -43,4 +44,10 @@ namespace sw
 	{
 		return functionSize - static_cast<int>((uintptr_t)entry - (uintptr_t)buffer);
 	}
+#else
+	LLVMRoutine::~LLVMRoutine()
+	{
+		dtor(reactorJIT, moduleKey);
+	}
+#endif
 }

src/Reactor/LLVMRoutine.hpp

@@ -17,8 +17,11 @@
 
 #include "Routine.hpp"
 
+#include <cstdint>
+
 namespace sw
 {
+#if SWIFTSHADER_LLVM_VERSION < 7
 	class LLVMRoutineManager;
 
 	class LLVMRoutine : public Routine
@@ -48,6 +51,32 @@ namespace sw
 
 		//const bool dynamic;   // Generated or precompiled
 	};
+#else
+	class LLVMReactorJIT;
+
+	class LLVMRoutine : public Routine
+	{
+	public:
+		LLVMRoutine(void *ent, void (*callback)(LLVMReactorJIT *, uint64_t),
+					LLVMReactorJIT *jit, uint64_t key)
+			: entry(ent), dtor(callback), reactorJIT(jit), moduleKey(key)
+		{ }
+
+		virtual ~LLVMRoutine();
+
+		const void *getEntry()
+		{
+			return entry;
+		}
+
+	private:
+		const void *entry;
+
+		void (*dtor)(LLVMReactorJIT *, uint64_t);
+		LLVMReactorJIT *reactorJIT;
+		uint64_t moduleKey;
+	};
+#endif  // SWIFTSHADER_LLVM_VERSION < 7
 }
 
 #endif   // sw_LLVMRoutine_hpp

src/Reactor/LLVMRoutineManager.cpp

@@ -14,6 +14,8 @@
 
 #include "LLVMRoutineManager.hpp"
 
+#if SWIFTSHADER_LLVM_VERSION < 7
+
 #include "LLVMRoutine.hpp"
 #include "llvm/Function.h"
 #include "../Common/Memory.hpp"
@@ -146,3 +148,5 @@ namespace sw
 		return result;
 	}
 }
+
+#endif  // SWIFTSHADER_LLVM_VERSION < 7

src/Reactor/LLVMRoutineManager.hpp

@@ -15,8 +15,10 @@
 #ifndef sw_LLVMRoutineManager_hpp
 #define sw_LLVMRoutineManager_hpp
 
-#include "llvm/GlobalValue.h"
+#if SWIFTSHADER_LLVM_VERSION < 7
+
 #include "llvm/ExecutionEngine/JITMemoryManager.h"
+#include "llvm/GlobalValue.h"
 
 namespace sw
 {
@@ -54,4 +56,6 @@ namespace sw
 	};
 }
 
+#endif  // SWIFTSHADER_LLVM_VERSION < 7
+
 #endif   // sw_LLVMRoutineManager_hpp