Merge remote-tracking branch 'upstream/develop' into pr/evmjit

extdep/CMakeLists.txt

@@ -7,7 +7,7 @@ include(eth_download.cmake)
 # all dependencies will be installed into this directory, separated by platform
 string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name)
 set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${_system_name}")
-set(ETH_DEPENDENCY_SERVER "http://poc-7.ethdev.com/precompiled/${_system_name}")
+set(ETH_DEPENDENCY_SERVER "http://build.ethdev.com/builds/${_system_name}-precompiled")
 file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/lib)
 file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/include)
 file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/bin)

libevm/VM.h

@@ -86,7 +86,8 @@ inline bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _st
 		for (unsigned i = 0; i < _ext.code.size(); ++i)
 			if (_ext.code[i] == (byte)Instruction::JUMPDEST)
 				m_jumpDests.insert(i);
-
+			else if (_ext.code[i] >= (byte)Instruction::PUSH1 && _ext.code[i] <= (byte)Instruction::PUSH32)
+				i += _ext.code[i] - (unsigned)Instruction::PUSH1 + 1;
 	u256 nextPC = m_curPC + 1;
 	auto osteps = _steps;
 	for (bool stopped = false; !stopped && _steps--; m_curPC = nextPC, nextPC = m_curPC + 1)

libevmcore/Assembly.cpp

@@ -391,9 +391,9 @@ Assembly& Assembly::optimise(bool _enable)
 				if (matches(vr, &r.first))
 				{
 					auto rw = r.second(vr);
-					unsigned const vrSize = bytesRequiredBySlice(vr.begin(), vr.end());
-					unsigned const rwSize = bytesRequiredBySlice(rw.begin(), rw.end());
-					if (rwSize < vrSize || (rwSize == vrSize && popCountIncreased(vr, rw)))
+					unsigned const vrSizeInBytes = bytesRequiredBySlice(vr.begin(), vr.end());
+					unsigned const rwSizeInBytes = bytesRequiredBySlice(rw.begin(), rw.end());
+					if (rwSizeInBytes < vrSizeInBytes || (rwSizeInBytes == vrSizeInBytes && popCountIncreased(vr, rw)))
 					{
 						copt << vr << "matches" << AssemblyItemsConstRef(&r.first) << "becomes...";
 						copt << AssemblyItemsConstRef(&rw);

libsolidity/Compiler.h

@@ -30,7 +30,7 @@ namespace solidity {
 class Compiler: private ASTConstVisitor
 {
 public:
-	explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_returnTag(m_context.newTag()) {}
+	explicit Compiler(bool _optimize = false): m_optimize(_optimize), m_context(), m_returnTag(m_context.newTag()) {}
 
 	void compileContract(ContractDefinition const& _contract, std::vector<MagicVariableDeclaration const*> const& _magicGlobals,
 						 std::map<ContractDefinition const*, bytes const*> const& _contracts);

libsolidity/CompilerStack.h

@@ -113,7 +113,7 @@ private:
 
 	struct Contract
 	{
-		ContractDefinition const* contract;
+		ContractDefinition const* contract = nullptr;
 		std::shared_ptr<Compiler> compiler;
 		bytes bytecode;
 		std::shared_ptr<InterfaceHandler> interfaceHandler;

libsolidity/ExpressionCompiler.h

@@ -146,12 +146,12 @@ private:
 
 	private:
 		CompilerContext* m_context;
-		LValueType m_type;
+		LValueType m_type = NONE;
 		/// If m_type is STACK, this is base stack offset (@see
 		/// CompilerContext::getBaseStackOffsetOfVariable) of a local variable.
-		unsigned m_baseStackOffset;
+		unsigned m_baseStackOffset = 0;
 		/// Size of the value of this lvalue on the stack.
-		unsigned m_stackSize;
+		unsigned m_stackSize = 0;
 	};
 
 	bool m_optimize;

libsolidity/GlobalContext.h

@@ -56,7 +56,7 @@ public:
 
 private:
 	std::vector<std::shared_ptr<MagicVariableDeclaration const>> m_magicVariables;
-	ContractDefinition const* m_currentContract;
+	ContractDefinition const* m_currentContract = nullptr;
 	std::map<ContractDefinition const*, std::shared_ptr<MagicVariableDeclaration const>> mutable m_thisPointer;
 };
 

libsolidity/NameAndTypeResolver.h

@@ -69,7 +69,7 @@ private:
 	/// not contain code.
 	std::map<ASTNode const*, DeclarationContainer> m_scopes;
 
-	DeclarationContainer* m_currentScope;
+	DeclarationContainer* m_currentScope = nullptr;
 };
 
 /**

libsolidity/Types.h

@@ -387,6 +387,9 @@ public:
 protected:
 	virtual TypePointer binaryOperatorResultImpl(Token::Value _operator, TypePointer const& _this, TypePointer const& _other) const override
 	{
+		(void)_operator;
+		(void)_this;
+		(void)_other;
 		return TypePointer();
 	}
 };
@@ -412,6 +415,9 @@ public:
 protected:
 	virtual TypePointer binaryOperatorResultImpl(Token::Value _operator, TypePointer const& _this, TypePointer const& _other) const override
 	{
+		(void)_operator;
+		(void)_this;
+		(void)_other;
 		return TypePointer();
 	}
 
@@ -442,6 +448,9 @@ public:
 protected:
 	virtual TypePointer binaryOperatorResultImpl(Token::Value _operator, TypePointer const& _this, TypePointer const& _other) const override
 	{
+		(void)_operator;
+		(void)_this;
+		(void)_other;
 		return TypePointer();
 	}
 

mix/AssemblyDebuggerModel.cpp

@@ -74,7 +74,6 @@ DebuggingContent AssemblyDebuggerModel::executeTransaction(bytesConstRef const&
 
 	execution.go(onOp);
 	execution.finalize();
-	m_executiveState.completeMine();
 
 	DebuggingContent d;
 	d.returnValue = execution.out().toVector();

mix/qml/StateDialog.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.2
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
 

mix/qml/StateList.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.2
-import QtQuick.Controls.Styles 1.2
-import QtQuick.Controls 1.2
-import QtQuick.Dialogs 1.2
+import QtQuick.Controls.Styles 1.1
+import QtQuick.Controls 1.1
+import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 
 Rectangle {

mix/qml/TransactionDialog.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.2
-import QtQuick.Controls 1.2
+import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
 

mix/qml/main.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.2
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.2
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.1