#include cleanups

libevmjit/Arith256.cpp

@@ -3,8 +3,9 @@
 #include "Type.h"
 #include "Endianness.h"
 
-#include <llvm/IR/Function.h>
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
 
 #include <iostream>
 

libevmjit/Arith256.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "CompilerHelper.h"
 
 namespace dev

libevmjit/BasicBlock.cpp

@@ -1,15 +1,15 @@
-
 #include "BasicBlock.h"
+#include "Type.h"
 
-#include <iostream>
+#include "preprocessor/llvm_includes_start.h"
-
 #include <llvm/IR/CFG.h>
 #include <llvm/IR/Function.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/IR/IRBuilder.h>
 #include <llvm/Support/raw_os_ostream.h>
+#include "preprocessor/llvm_includes_end.h"
 
-#include "Type.h"
+#include <iostream>
 
 namespace dev
 {
@@ -141,7 +141,7 @@ void BasicBlock::synchronizeLocalStack(Stack& _evmStack)
 	auto endIter = m_currentStack.end();
 
 	// Update (emit set()) changed values
-	for (int idx = m_currentStack.size() - 1 - m_tosOffset;
+	for (int idx = (int)m_currentStack.size() - 1 - m_tosOffset;
 		 currIter < endIter && idx >= 0;
 		 ++currIter, --idx)
 	{
@@ -308,7 +308,7 @@ void BasicBlock::linkLocalStacks(std::vector<BasicBlock*> basicBlocks, llvm::IRB
 		auto& initialStack = bblock.m_initialStack;
 		initialStack.erase(initialStack.begin(), initialStack.begin() + info.inputItems);
 		// Initial stack shrinks, so the size difference grows:
-		bblock.m_tosOffset += info.inputItems;
+		bblock.m_tosOffset += (int)info.inputItems;
 	}
 
 	// We must account for the items that were pushed directly to successor
@@ -321,7 +321,7 @@ void BasicBlock::linkLocalStacks(std::vector<BasicBlock*> basicBlocks, llvm::IRB
 
 		auto& exitStack = bblock.m_currentStack;
 		exitStack.erase(exitStack.end() - info.outputItems, exitStack.end());
-		bblock.m_tosOffset -= info.outputItems;
+		bblock.m_tosOffset -= (int)info.outputItems; // FIXME: Fix types
 	}
 }
 

libevmjit/BasicBlock.h

@@ -1,8 +1,7 @@
 #pragma once
-#include <vector>
-#include <llvm/IR/BasicBlock.h>
 #include "Common.h"
 #include "Stack.h"
+#include <vector>
 
 namespace dev
 {

libevmjit/Cache.cpp

@@ -1,14 +1,17 @@
 #include "Cache.h"
-#include <unordered_map>
+#include "ExecutionEngine.h"
-#include <cassert>
+
-#include <iostream>
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/Instructions.h>
 #include <llvm/Support/Path.h>
 #include <llvm/Support/FileSystem.h>
 #include <llvm/Support/raw_os_ostream.h>
-#include "ExecutionEngine.h"
+#include "preprocessor/llvm_includes_end.h"
+
+#include <cassert>
+#include <iostream>
 
 namespace dev
 {

libevmjit/Cache.h

@@ -1,8 +1,6 @@
 #pragma once
-
-#include <memory>
 #include <llvm/ExecutionEngine/ObjectCache.h>
-
+#include <memory>
 
 namespace dev
 {

libevmjit/Common.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <vector>
 #include <tuple>
 #include <cstdint>

libevmjit/Compiler.cpp

@@ -1,19 +1,4 @@
-
 #include "Compiler.h"
-
-#include <functional>
-#include <fstream>
-#include <chrono>
-#include <sstream>
-
-#include <llvm/ADT/PostOrderIterator.h>
-#include <llvm/IR/CFG.h>
-#include <llvm/IR/Module.h>
-#include <llvm/IR/IntrinsicInst.h>
-
-#include <llvm/PassManager.h>
-#include <llvm/Transforms/Scalar.h>
-
 #include "Instruction.h"
 #include "Type.h"
 #include "Memory.h"
@@ -25,6 +10,20 @@
 #include "Arith256.h"
 #include "RuntimeManager.h"
 
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/ADT/PostOrderIterator.h>
+#include <llvm/IR/CFG.h>
+#include <llvm/IR/Module.h>
+#include <llvm/IR/IntrinsicInst.h>
+#include <llvm/PassManager.h>
+#include <llvm/Transforms/Scalar.h>
+#include "preprocessor/llvm_includes_end.h"
+
+#include <functional>
+#include <fstream>
+#include <chrono>
+#include <sstream>
+
 namespace dev
 {
 namespace eth

libevmjit/Compiler.h

@@ -1,8 +1,4 @@
-
 #pragma once
-
-#include <llvm/IR/IRBuilder.h>
-
 #include "Common.h"
 #include "BasicBlock.h"
 

libevmjit/CompilerHelper.cpp

@@ -1,10 +1,6 @@
-
 #include "CompilerHelper.h"
-
-#include <llvm/IR/Function.h>
-#include <llvm/IR/Module.h>
-
 #include "RuntimeManager.h"
+#include <llvm/IR/Module.h>
 
 namespace dev
 {

libevmjit/CompilerHelper.h

@@ -1,7 +1,8 @@
-
 #pragma once
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IRBuilder.h>
+#include "preprocessor/llvm_includes_end.h"
 
 
 namespace dev
@@ -19,7 +20,7 @@ protected:
 	CompilerHelper(llvm::IRBuilder<>& _builder);
 
 	CompilerHelper(const CompilerHelper&) = delete;
-	void operator=(CompilerHelper) = delete;
+	CompilerHelper& operator=(CompilerHelper) = delete;
 
 	/// Reference to the IR module being compiled
 	llvm::Module* getModule();

libevmjit/Endianness.cpp

@@ -1,9 +1,9 @@
-
 #include "Endianness.h"
+#include "Type.h"
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IntrinsicInst.h>
-
+#include "preprocessor/llvm_includes_end.h"
-#include "Type.h"
 
 namespace dev
 {

libevmjit/Endianness.h

@@ -1,7 +1,8 @@
-
 #pragma once
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/IRBuilder.h>
+#include "preprocessor/llvm_includes_end.h"
 
 namespace dev
 {

libevmjit/ExecStats.h

@@ -1,8 +1,6 @@
 #pragma once
-
-#include <string>
-#include <chrono>
 #include "ExecutionEngine.h"
+#include <chrono>
 
 namespace dev
 {

libevmjit/ExecutionEngine.cpp

@@ -1,7 +1,10 @@
 #include "ExecutionEngine.h"
+#include "Runtime.h"
+#include "Compiler.h"
+#include "Cache.h"
+#include "ExecStats.h"
+#include "BuildInfo.gen.h"
 
-#include <chrono>
-#include <cstdlib>	// env options
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
 #include <llvm/ADT/Triple.h>
@@ -12,12 +15,8 @@
 #include <llvm/Support/Host.h>
 #include "preprocessor/llvm_includes_end.h"
 
-#include "Runtime.h"
+#include <array>
-#include "Compiler.h"
+#include <cstdlib>	// env options
-#include "Cache.h"
-#include "ExecStats.h"
-#include "BuildInfo.gen.h"
-
 #include <iostream>
 
 namespace dev

libevmjit/ExecutionEngine.h

@@ -1,7 +1,6 @@
 #pragma once
-
-#include <memory>
 #include "RuntimeData.h"
+#include <memory>
 
 namespace dev
 {

libevmjit/Ext.cpp

@@ -1,15 +1,13 @@
-
 #include "Ext.h"
-
-#include <llvm/IR/Function.h>
-#include <llvm/IR/TypeBuilder.h>
-#include <llvm/IR/IntrinsicInst.h>
-
 #include "RuntimeManager.h"
 #include "Memory.h"
 #include "Type.h"
 #include "Endianness.h"
 
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
+
 namespace dev
 {
 namespace eth

libevmjit/Ext.h

@@ -1,8 +1,6 @@
-
 #pragma once
-
-#include <array>
 #include "CompilerHelper.h"
+#include <array>
 
 namespace dev
 {

libevmjit/GasMeter.cpp

@@ -1,13 +1,11 @@
-
 #include "GasMeter.h"
+#include "Ext.h"
+#include "RuntimeManager.h"
 
-#include <llvm/IR/GlobalVariable.h>
+#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/Function.h>
 #include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
 
-#include "Type.h"
-#include "Ext.h"
-#include "RuntimeManager.h"
 
 namespace dev
 {

libevmjit/GasMeter.h

@@ -1,6 +1,4 @@
-
 #pragma once
-
 #include "CompilerHelper.h"
 #include "Instruction.h"
 

libevmjit/Instruction.cpp

@@ -1,6 +1,8 @@
-
 #include "Instruction.h"
+
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/ADT/APInt.h>
+#include "preprocessor/llvm_includes_end.h"
 
 namespace dev
 {

libevmjit/Instruction.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Common.h"
 
 namespace llvm

libevmjit/Memory.cpp

@@ -1,21 +1,14 @@
 #include "Memory.h"
-
-#include <vector>
-#include <iostream>
-#include <iomanip>
-#include <cstdint>
-#include <cassert>
-
-#include <llvm/IR/GlobalVariable.h>
-#include <llvm/IR/Function.h>
-#include <llvm/IR/IntrinsicInst.h>
-
 #include "Type.h"
 #include "Runtime.h"
 #include "GasMeter.h"
 #include "Endianness.h"
 #include "RuntimeManager.h"
 
+#include "preprocessor/llvm_includes_start.h"
+#include <llvm/IR/IntrinsicInst.h>
+#include "preprocessor/llvm_includes_end.h"
+
 namespace dev
 {
 namespace eth

libevmjit/Memory.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "CompilerHelper.h"
 
 namespace dev

libevmjit/Runtime.cpp

@@ -1,9 +1,5 @@
-
 #include "Runtime.h"
-
+#include <cassert>
-#include <llvm/IR/GlobalVariable.h>
-#include <llvm/IR/Function.h>
-#include <llvm/IR/IntrinsicInst.h>
 
 namespace dev
 {

libevmjit/Runtime.h

@@ -1,8 +1,6 @@
-
 #pragma once
-
-#include <csetjmp>
 #include "RuntimeData.h"
+#include <csetjmp>
 
 namespace dev
 {

libevmjit/RuntimeData.h

@@ -1,7 +1,5 @@
 #pragma once
-
+#include "Common.h"
-#include "Utils.h"
-
 
 namespace dev
 {

libevmjit/RuntimeManager.cpp

@@ -1,12 +1,8 @@
-
 #include "RuntimeManager.h"
 
-#include <llvm/IR/GlobalVariable.h>
+#include "preprocessor/llvm_includes_start.h"
-#include <llvm/IR/Function.h>
 #include <llvm/IR/IntrinsicInst.h>
-
+#include "preprocessor/llvm_includes_end.h"
-#include "RuntimeData.h"
-#include "Instruction.h"
 
 namespace dev
 {

libevmjit/RuntimeManager.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "CompilerHelper.h"
 #include "Type.h"
 #include "RuntimeData.h"

libevmjit/Stack.cpp

@@ -1,10 +1,8 @@
 #include "Stack.h"
 #include "RuntimeManager.h"
 #include "Runtime.h"
-#include "Type.h"
 
 #include <llvm/IR/Function.h>
-#include <llvm/IR/TypeBuilder.h>
 
 namespace dev
 {

libevmjit/Stack.h

@@ -1,9 +1,6 @@
 #pragma once
-
 #include "CompilerHelper.h"
 
-#include <llvm/IR/Module.h>
-
 namespace dev
 {
 namespace eth

libevmjit/Type.cpp

@@ -1,8 +1,4 @@
-
 #include "Type.h"
-
-#include <llvm/IR/DerivedTypes.h>
-
 #include "RuntimeManager.h"
 
 namespace dev

libevmjit/Type.h

@@ -1,9 +1,10 @@
-
 #pragma once
+#include "Common.h"
 
+#include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Type.h>
 #include <llvm/IR/Constants.h>
-#include "Common.h"
+#include "preprocessor/llvm_includes_end.h"
 
 namespace dev
 {

libevmjit/Utils.cpp

@@ -1,4 +1,3 @@
-
 #include "Utils.h"
 
 namespace dev

libevmjit/Utils.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Common.h"
 
 namespace dev

libevmjit/preprocessor/llvm_includes_start.h

@@ -1,4 +1,5 @@
 
 #pragma warning(push)
+#pragma warning(disable: 4267 4244 4800)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"