Merge remote-tracking branch 'upstream/develop' into stateTests

libevm/VM.h

@@ -448,16 +448,18 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			m_stack.pop_back();
 			break;
 		case Instruction::SIGNEXTEND:
+			if (m_stack.back() < 31)
 			{
-			unsigned k = m_stack.back();
+				unsigned const testBit(m_stack.back() * 8 + 7);
+				u256& number = m_stack[m_stack.size() - 2];
+				u256 mask = ((u256(1) << testBit) - 1);
+				if (boost::multiprecision::bit_test(number, testBit))
+					number |= ~mask;
+				else
+					number &= mask;
+			}
 			m_stack.pop_back();
-			auto& b = m_stack.back();
-			if (k <= 31)
-				if ((b >> (k * 8)) & 0x80)
-					for (int i = 31; i > k; --i)
-						b |= (u256(0xff) << i);
 			break;
-		}
 		case Instruction::SHA3:
 		{
 			unsigned inOff = (unsigned)m_stack.back();

liblll/Assembly.cpp

@@ -54,6 +54,7 @@ unsigned Assembly::bytesRequired() const
 			switch (i.m_type)
 			{
 			case Operation:
+			case Tag: // 1 byte for the JUMPDEST
 				ret++;
 				break;
 			case PushString:
@@ -69,7 +70,6 @@ unsigned Assembly::bytesRequired() const
 			case PushData:
 			case PushSub:
 				ret += 1 + br;
-			case Tag:;
 			default:;
 			}
 		if (dev::bytesRequired(ret) <= br)

libsolidity/Parser.cpp

@@ -266,9 +266,11 @@ ASTPointer<Statement> Parser::parseStatement()
 		// starting from here, all statements must be terminated by a semicolon
 	case Token::CONTINUE:
 		statement = ASTNodeFactory(*this).createNode<Continue>();
+		m_scanner->next();
 		break;
 	case Token::BREAK:
 		statement = ASTNodeFactory(*this).createNode<Break>();
+		m_scanner->next();
 		break;
 	case Token::RETURN:
 	{

test/solidityParser.cpp

@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(while_loop)
 {
 	char const* text = "contract test {\n"
 					   "  function fun(uint256 a) {\n"
-					   "    uint256 x = (1 + 4).member(++67) || true;\n"
+					   "    while (true) { uint256 x = 1; break; continue; } x = 9;\n"
 					   "  }\n"
 					   "}\n";
 	BOOST_CHECK_NO_THROW(parseText(text));