Merge pull request #1412 from imapp-pl/pr/evmjit_bugfix

EVMJIT bugfixes

evmjit/libevmjit-cpp/Env.cpp

@@ -52,7 +52,6 @@ extern "C"
 		auto endowment = llvm2eth(*_endowment);
 		if (_env->balance(_env->myAddress) >= endowment && _env->depth < 1024)
 		{
-			_env->subBalance(endowment);
 			u256 gas = *io_gas;
 			h256 address(_env->create(endowment, gas, {_initBeg, _initSize}, {}), h256::AlignRight);
 			*io_gas = static_cast<int64_t>(gas);
@@ -89,10 +88,7 @@ extern "C"
 		auto ret = false;
 		auto callGas = u256{_callGas};
 		if (_env->balance(_env->myAddress) >= value && _env->depth < 1024)
-		{
-			_env->subBalance(value);
 			ret = _env->call(receiveAddress, value, {_inBeg, _inSize}, callGas, {_outBeg, _outSize}, {}, {}, codeAddress);
-		}
 
 		*io_gas += static_cast<int64_t>(callGas); // it is never more than initial _callGas
 		return ret;

evmjit/libevmjit/ExecutionEngine.cpp

@@ -4,6 +4,8 @@
 #include <mutex>
 #include <iostream>
 #include <unordered_map>
+#include <cstdlib>
+#include <cstring>
 
 #include "preprocessor/llvm_includes_start.h"
 #include <llvm/IR/Module.h>
@@ -82,7 +84,20 @@ void parseOptions()
 {
 	static llvm::llvm_shutdown_obj shutdownObj{};
 	cl::AddExtraVersionPrinter(printVersion);
-	cl::ParseEnvironmentOptions("evmjit", "EVMJIT", "Ethereum EVM JIT Compiler");
+	//cl::ParseEnvironmentOptions("evmjit", "EVMJIT", "Ethereum EVM JIT Compiler");
+
+	// FIXME: LLVM workaround:
+	// Manually select instruction scheduler other than "source".
+	// "source" scheduler has a bug: http://llvm.org/bugs/show_bug.cgi?id=22304
+	auto envLine = std::getenv("EVMJIT");
+	auto commandLine = std::string{"evmjit "} + (envLine ? envLine : "") + " -pre-RA-sched=list-burr\0";
+	static const auto c_maxArgs = 20;
+	char const* argv[c_maxArgs] = {nullptr, };
+	auto arg = std::strtok(&*commandLine.begin(), " ");
+	auto i = 0;
+	for (; i < c_maxArgs && arg; ++i, arg = std::strtok(nullptr, " "))
+		argv[i] = arg;
+	cl::ParseCommandLineOptions(i, argv, "Ethereum EVM JIT Compiler");
 }
 
 }