mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Use callback properly in SMTLib2 interface
This commit is contained in:
parent
cabec89872
commit
efb0d4253c
@ -39,17 +39,14 @@ using namespace solidity::frontend;
|
|||||||
using namespace solidity::smtutil;
|
using namespace solidity::smtutil;
|
||||||
|
|
||||||
SMTLib2Interface::SMTLib2Interface(
|
SMTLib2Interface::SMTLib2Interface(
|
||||||
std::map<h256, std::string> _queryResponses,
|
[[maybe_unused]] std::map<h256, string> _queryResponses,
|
||||||
ReadCallback::Callback _smtCallback,
|
ReadCallback::Callback _smtCallback,
|
||||||
SMTSolverChoice _enabledSolvers,
|
SMTSolverChoice _enabledSolvers,
|
||||||
std::optional<unsigned> _queryTimeout,
|
std::optional<unsigned> _queryTimeout
|
||||||
bool _dumpQuery
|
|
||||||
):
|
):
|
||||||
SolverInterface(_queryTimeout),
|
SolverInterface(_queryTimeout),
|
||||||
m_queryResponses(std::move(_queryResponses)),
|
|
||||||
m_smtCallback(std::move(_smtCallback)),
|
m_smtCallback(std::move(_smtCallback)),
|
||||||
m_enabledSolvers(_enabledSolvers),
|
m_enabledSolvers(_enabledSolvers)
|
||||||
m_dumpQuery(_dumpQuery)
|
|
||||||
{
|
{
|
||||||
reset();
|
reset();
|
||||||
}
|
}
|
||||||
@ -117,13 +114,8 @@ void SMTLib2Interface::addAssertion(Expression const& _expr)
|
|||||||
write("(assert " + toSExpr(_expr) + ")");
|
write("(assert " + toSExpr(_expr) + ")");
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
|
namespace { // Helpers for querying solvers using SMT callback
|
||||||
{
|
auto resultFromSolverResponse (std::string const& response) {
|
||||||
std::string response = querySolver(
|
|
||||||
boost::algorithm::join(m_accumulatedOutput, "\n") +
|
|
||||||
checkSatAndGetValuesCommand(_expressionsToEvaluate)
|
|
||||||
);
|
|
||||||
|
|
||||||
CheckResult result;
|
CheckResult result;
|
||||||
// TODO proper parsing
|
// TODO proper parsing
|
||||||
if (boost::starts_with(response, "sat\n"))
|
if (boost::starts_with(response, "sat\n"))
|
||||||
@ -134,11 +126,76 @@ std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::ve
|
|||||||
result = CheckResult::UNKNOWN;
|
result = CheckResult::UNKNOWN;
|
||||||
else
|
else
|
||||||
result = CheckResult::ERROR;
|
result = CheckResult::ERROR;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<std::string> values;
|
bool solverAnswered(CheckResult result)
|
||||||
if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
|
{
|
||||||
values = parseValues(find(response.cbegin(), response.cend(), '\n'), response.cend());
|
return result == CheckResult::SATISFIABLE || result == CheckResult::UNSATISFIABLE;
|
||||||
return std::make_pair(result, values);
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> parseValues(std::string::const_iterator _start, std::string::const_iterator _end)
|
||||||
|
{
|
||||||
|
std::vector<string> values;
|
||||||
|
while (_start < _end)
|
||||||
|
{
|
||||||
|
auto valStart = find(_start, _end, ' ');
|
||||||
|
if (valStart < _end)
|
||||||
|
++valStart;
|
||||||
|
auto valEnd = find(valStart, _end, ')');
|
||||||
|
values.emplace_back(valStart, valEnd);
|
||||||
|
_start = find(valEnd, _end, '(');
|
||||||
|
}
|
||||||
|
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<string> parseValues(string const& solverAnswer)
|
||||||
|
{
|
||||||
|
return parseValues(find(solverAnswer.cbegin(), solverAnswer.cend(), '\n'), solverAnswer.cend());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
|
||||||
|
{
|
||||||
|
auto query = boost::algorithm::join(m_accumulatedOutput, "\n") +
|
||||||
|
checkSatAndGetValuesCommand(_expressionsToEvaluate);
|
||||||
|
|
||||||
|
std::vector<std::string> solverCommands;
|
||||||
|
if (m_enabledSolvers.z3)
|
||||||
|
solverCommands.emplace_back("z3");
|
||||||
|
if (m_enabledSolvers.cvc4)
|
||||||
|
solverCommands.emplace_back("cvc4");
|
||||||
|
|
||||||
|
CheckResult lastResult = CheckResult::ERROR;
|
||||||
|
std::vector<std::string> finalValues;
|
||||||
|
for (auto const& s: solverCommands)
|
||||||
|
{
|
||||||
|
auto callBackResult = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery) + ' ' + s, query);
|
||||||
|
if (not callBackResult.success)
|
||||||
|
continue;
|
||||||
|
auto const& response = callBackResult.responseOrErrorMessage;
|
||||||
|
CheckResult result = resultFromSolverResponse(response);
|
||||||
|
if (solverAnswered(result))
|
||||||
|
{
|
||||||
|
if (!solverAnswered(lastResult))
|
||||||
|
{
|
||||||
|
lastResult = result;
|
||||||
|
finalValues = parseValues(response);
|
||||||
|
}
|
||||||
|
else if (lastResult != result)
|
||||||
|
{
|
||||||
|
lastResult = CheckResult::CONFLICTING;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (result == CheckResult::UNKNOWN && lastResult == CheckResult::ERROR)
|
||||||
|
lastResult = result;
|
||||||
|
}
|
||||||
|
if (lastResult == CheckResult::ERROR) {
|
||||||
|
m_unhandledQueries.push_back(query);
|
||||||
|
}
|
||||||
|
return std::make_pair(lastResult, finalValues);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string SMTLib2Interface::toSExpr(Expression const& _expr)
|
std::string SMTLib2Interface::toSExpr(Expression const& _expr)
|
||||||
@ -295,37 +352,6 @@ std::string SMTLib2Interface::checkSatAndGetValuesCommand(std::vector<Expression
|
|||||||
return command;
|
return command;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> SMTLib2Interface::parseValues(std::string::const_iterator _start, std::string::const_iterator _end)
|
|
||||||
{
|
|
||||||
std::vector<std::string> values;
|
|
||||||
while (_start < _end)
|
|
||||||
{
|
|
||||||
auto valStart = find(_start, _end, ' ');
|
|
||||||
if (valStart < _end)
|
|
||||||
++valStart;
|
|
||||||
auto valEnd = find(valStart, _end, ')');
|
|
||||||
values.emplace_back(valStart, valEnd);
|
|
||||||
_start = find(valEnd, _end, '(');
|
|
||||||
}
|
|
||||||
|
|
||||||
return values;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string SMTLib2Interface::querySolver(std::string const& _input)
|
|
||||||
{
|
|
||||||
h256 inputHash = keccak256(_input);
|
|
||||||
if (m_queryResponses.count(inputHash))
|
|
||||||
return m_queryResponses.at(inputHash);
|
|
||||||
if (m_smtCallback)
|
|
||||||
{
|
|
||||||
auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
|
|
||||||
if (result.success)
|
|
||||||
return result.responseOrErrorMessage;
|
|
||||||
}
|
|
||||||
m_unhandledQueries.push_back(_input);
|
|
||||||
return "unknown\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string SMTLib2Interface::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
|
std::string SMTLib2Interface::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
|
||||||
{
|
{
|
||||||
return boost::algorithm::join(m_accumulatedOutput, "\n") +
|
return boost::algorithm::join(m_accumulatedOutput, "\n") +
|
||||||
|
@ -45,8 +45,7 @@ public:
|
|||||||
std::map<util::h256, std::string> _queryResponses = {},
|
std::map<util::h256, std::string> _queryResponses = {},
|
||||||
frontend::ReadCallback::Callback _smtCallback = {},
|
frontend::ReadCallback::Callback _smtCallback = {},
|
||||||
SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
|
SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
|
||||||
std::optional<unsigned> _queryTimeout = {},
|
std::optional<unsigned> _queryTimeout = {}
|
||||||
bool _printQuery = false
|
|
||||||
);
|
);
|
||||||
|
|
||||||
void reset() override;
|
void reset() override;
|
||||||
@ -78,10 +77,6 @@ private:
|
|||||||
void write(std::string _data);
|
void write(std::string _data);
|
||||||
|
|
||||||
std::string checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate);
|
std::string checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate);
|
||||||
std::vector<std::string> parseValues(std::string::const_iterator _start, std::string::const_iterator _end);
|
|
||||||
|
|
||||||
/// Communicates with the solver via the callback. Throws SMTSolverError on error.
|
|
||||||
std::string querySolver(std::string const& _input);
|
|
||||||
|
|
||||||
std::vector<std::string> m_accumulatedOutput;
|
std::vector<std::string> m_accumulatedOutput;
|
||||||
std::map<std::string, SortPointer> m_variables;
|
std::map<std::string, SortPointer> m_variables;
|
||||||
@ -92,12 +87,10 @@ private:
|
|||||||
/// otherwise solvers cannot parse the queries.
|
/// otherwise solvers cannot parse the queries.
|
||||||
std::vector<std::pair<std::string, std::string>> m_userSorts;
|
std::vector<std::pair<std::string, std::string>> m_userSorts;
|
||||||
|
|
||||||
std::map<util::h256, std::string> m_queryResponses;
|
|
||||||
std::vector<std::string> m_unhandledQueries;
|
std::vector<std::string> m_unhandledQueries;
|
||||||
|
|
||||||
frontend::ReadCallback::Callback m_smtCallback;
|
frontend::ReadCallback::Callback m_smtCallback;
|
||||||
SMTSolverChoice m_enabledSolvers;
|
SMTSolverChoice m_enabledSolvers;
|
||||||
bool m_dumpQuery;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ BMC::BMC(
|
|||||||
):
|
):
|
||||||
SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
|
SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
|
||||||
m_interface(std::make_unique<smtutil::SMTLib2Interface>(
|
m_interface(std::make_unique<smtutil::SMTLib2Interface>(
|
||||||
_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout, _settings.printQuery
|
_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout
|
||||||
))
|
))
|
||||||
{
|
{
|
||||||
solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
|
solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
|
||||||
|
Loading…
Reference in New Issue
Block a user