Fix boolean constants.

sledrho · Nov 22, 2017 · 95a65dc · 95a65dc
1 parent 90fb14f
commit 95a65dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/libsolidity/formal/Z3Interface.cpp b/libsolidity/formal/Z3Interface.cpp
@@ -139,8 +139,13 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 	}
 	else if (arguments.empty())
 	{
-		// We assume it is an integer...
-		return m_context.int_val(n.c_str());
+		if (n == "true")
+			return m_context.bool_val(true);
+		else if (n == "false")
+			return m_context.bool_val(false);
+		else
+			// We assume it is an integer...
+			return m_context.int_val(n.c_str());
 	}
 
 	solAssert(arity.count(n) && arity.at(n) == arguments.size(), "");

diff --git a/test/libsolidity/SMTChecker.cpp b/test/libsolidity/SMTChecker.cpp
@@ -362,18 +362,15 @@ BOOST_AUTO_TEST_CASE(constant_condition)
 		}
 	)";
 	CHECK_WARNING(text, "Condition is always false");
-// TODO
-//	// a plain literal constant is fine
-//	text = R"(
-//		contract C {
-//			function f(uint x) public pure {
-//				if (true) { revert(); }
-//			}
-//		}
-//	)";
-//	CHECK_SUCCESS_NO_WARNINGS(text);
-
-// TODO test unreacheable code
+	// a plain literal constant is fine
+	text = R"(
+		contract C {
+			function f(uint) public pure {
+				if (true) { revert(); }
+			}
+		}
+	)";
+	CHECK_SUCCESS_NO_WARNINGS(text);
 }
 
 BOOST_AUTO_TEST_SUITE_END()