Merge pull request #2470 from chriseth/sol_fix_bytesComparison

Fix comparison between bytes types.

libsolidity/ExpressionCompiler.cpp

@@ -935,24 +935,27 @@ void ExpressionCompiler::appendCompareOperatorCode(Token::Value _operator, Type
 	}
 	else
 	{
-		IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
-		bool const c_isSigned = type.isSigned();
+		bool isSigned = false;
+		if (auto type = dynamic_cast<IntegerType const*>(&_type))
+			isSigned = type->isSigned();
 
 		switch (_operator)
 		{
 		case Token::GreaterThanOrEqual:
-			m_context << (c_isSigned ? eth::Instruction::SLT : eth::Instruction::LT)
-					  << eth::Instruction::ISZERO;
+			m_context <<
+				(isSigned ? eth::Instruction::SLT : eth::Instruction::LT) <<
+				eth::Instruction::ISZERO;
 			break;
 		case Token::LessThanOrEqual:
-			m_context << (c_isSigned ? eth::Instruction::SGT : eth::Instruction::GT)
-					  << eth::Instruction::ISZERO;
+			m_context <<
+				(isSigned ? eth::Instruction::SGT : eth::Instruction::GT) <<
+				eth::Instruction::ISZERO;
 			break;
 		case Token::GreaterThan:
-			m_context << (c_isSigned ? eth::Instruction::SGT : eth::Instruction::GT);
+			m_context << (isSigned ? eth::Instruction::SGT : eth::Instruction::GT);
 			break;
 		case Token::LessThan:
-			m_context << (c_isSigned ? eth::Instruction::SLT : eth::Instruction::LT);
+			m_context << (isSigned ? eth::Instruction::SLT : eth::Instruction::LT);
 			break;
 		default:
 			BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Unknown comparison operator."));

test/libsolidity/SolidityEndToEndTest.cpp

@@ -585,6 +585,22 @@ BOOST_AUTO_TEST_CASE(inc_dec_operators)
 	BOOST_CHECK(callContractFunction("f()") == encodeArgs(0x53866));
 }
 
+BOOST_AUTO_TEST_CASE(bytes_comparison)
+{
+	char const* sourceCode = R"(
+		contract test {
+			function f() returns (bool) {
+				bytes2 a = "a";
+				bytes2 x = "aa";
+				bytes2 b = "b";
+				return a < x && x < b;
+			}
+		}
+	)";
+	compileAndRun(sourceCode);
+	BOOST_CHECK(callContractFunction("f()") == encodeArgs(true));
+}
+
 BOOST_AUTO_TEST_CASE(state_smoke_test)
 {
 	char const* sourceCode = "contract test {\n"