Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_state

libp2p/Host.cpp

@@ -226,7 +226,7 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameIO* _io
 					return;
 				}
 		
-		if (peerCount() > 2 * m_idealPeerCount)
+		if (peerCount() > 9 * m_idealPeerCount)
 		{
 			ps->disconnect(TooManyPeers);
 			return;
@@ -341,7 +341,7 @@ void Host::runAcceptor()
 		auto socket = make_shared<RLPXSocket>(new bi::tcp::socket(m_ioService));
 		m_tcp4Acceptor.async_accept(socket->ref(), [=](boost::system::error_code ec)
 		{
-			if (peerCount() > 2 * m_idealPeerCount)
+			if (peerCount() > 9 * m_idealPeerCount)
 			{
 				clog(NetConnect) << "Dropping incoming connect due to maximum peer count (2 * ideal peer count): " << socket->remoteEndpoint();
 				socket->close();

libsolidity/Compiler.cpp

@@ -431,7 +431,8 @@ bool Compiler::visit(ForStatement const& _forStatement)
 	CompilerContext::LocationSetter locationSetter(m_context, _forStatement);
 	eth::AssemblyItem loopStart = m_context.newTag();
 	eth::AssemblyItem loopEnd = m_context.newTag();
-	m_continueTags.push_back(loopStart);
+	eth::AssemblyItem loopNext = m_context.newTag();
+	m_continueTags.push_back(loopNext);
 	m_breakTags.push_back(loopEnd);
 
 	if (_forStatement.getInitializationExpression())
@@ -449,6 +450,8 @@ bool Compiler::visit(ForStatement const& _forStatement)
 
 	_forStatement.getBody().accept(*this);
 
+	m_context << loopNext;
+
 	// for's loop expression if existing
 	if (_forStatement.getLoopExpression())
 		_forStatement.getLoopExpression()->accept(*this);

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -54,7 +54,7 @@ const unsigned dev::SensibleHttpThreads = 1;
 #else
 const unsigned dev::SensibleHttpThreads = 4;
 #endif
-const unsigned dev::SensibleHttpPort = 8080;
+const unsigned dev::SensibleHttpPort = 8545;
 
 static Json::Value toJson(dev::eth::BlockInfo const& _bi)
 {

test/libsolidity/SolidityEndToEndTest.cpp

@@ -300,6 +300,52 @@ BOOST_AUTO_TEST_CASE(for_loop_simple_init_expr)
 	testSolidityAgainstCppOnRange("f(uint256)", for_loop_simple_init_expr_cpp, 0, 5);
 }
 
+BOOST_AUTO_TEST_CASE(for_loop_break_continue)
+{
+	char const* sourceCode = R"(
+		contract test {
+			function f(uint n) returns (uint r)
+			{
+				uint i = 1;
+				uint k = 0;
+				for (i *= 5; k < n; i *= 7)
+				{
+					k++;
+					i += 4;
+					if (n % 3 == 0)
+						break;
+					i += 9;
+					if (n % 2 == 0)
+						continue;
+					i += 19;
+				}
+				return i;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+
+	auto breakContinue = [](u256 const& n) -> u256
+	{
+		u256 i = 1;
+		u256 k = 0;
+		for (i *= 5; k < n; i *= 7)
+		{
+			k++;
+			i += 4;
+			if (n % 3 == 0)
+				break;
+			i += 9;
+			if (n % 2 == 0)
+				continue;
+			i += 19;
+		}
+		return i;
+	};
+
+	testSolidityAgainstCppOnRange("f(uint256)", breakContinue, 0, 10);
+}
+
 BOOST_AUTO_TEST_CASE(calling_other_functions)
 {
 	char const* sourceCode = "contract collatz {\n"