cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display better error message in SMTLib2

Browse Source
This commit is contained in:
Leonardo Alt 2018-08-03 17:04:56 +02:00
parent f44be616c9
commit f3c2309c73
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/formal/SMTLib2Interface.cpp
View File

@ -39,8 +39,8 @@ using namespace dev;
using namespace dev::solidity; using namespace dev::solidity;
using namespace dev::solidity::smt; using namespace dev::solidity::smt;
SMTLib2Interface::SMTLib2Interface(map<h256, string> const& _smtlib2Responses): SMTLib2Interface::SMTLib2Interface(map<h256, string> const& _queryResponses):
m_smtlib2Responses(_smtlib2Responses) m_queryResponses(_queryResponses)
{ {
reset(); reset();
} }
@ -215,8 +215,8 @@ vector<string> SMTLib2Interface::parseValues(string::const_iterator _start, stri
string SMTLib2Interface::querySolver(string const& _input) string SMTLib2Interface::querySolver(string const& _input)
{ {
h256 inputHash = dev::keccak256(_input); h256 inputHash = dev::keccak256(_input);
if (m_smtlib2Responses.count(inputHash)) if (m_queryResponses.count(inputHash))
return m_smtlib2Responses.at(inputHash); return m_queryResponses.at(inputHash);
else else
{ {
m_unhandledQueries.push_back(_input); m_unhandledQueries.push_back(_input);

4
libsolidity/formal/SMTLib2Interface.h
View File

@ -44,7 +44,7 @@ namespace smt
class SMTLib2Interface: public SolverInterface, public boost::noncopyable class SMTLib2Interface: public SolverInterface, public boost::noncopyable
{ {
public: public:
explicit SMTLib2Interface(std::map<h256, std::string> const& _smtlib2Responses); explicit SMTLib2Interface(std::map<h256, std::string> const& _queryResponses);
void reset() override; void reset() override;
@ -73,10 +73,10 @@ private:
/// Communicates with the solver via the callback. Throws SMTSolverError on error. /// Communicates with the solver via the callback. Throws SMTSolverError on error.
std::string querySolver(std::string const& _input); std::string querySolver(std::string const& _input);
std::map<h256, std::string> const& m_smtlib2Responses;
std::vector<std::string> m_accumulatedOutput; std::vector<std::string> m_accumulatedOutput;
std::set<std::string> m_variables; std::set<std::string> m_variables;
std::map<h256, std::string> const& m_queryResponses;
std::vector<std::string> m_unhandledQueries; std::vector<std::string> m_unhandledQueries;
}; };

6
libsolidity/formal/SMTPortfolio.cpp
View File

@ -45,8 +45,10 @@ SMTPortfolio::SMTPortfolio(map<h256, string> const& _smtlib2Responses)
#else #else
if (!_smtlib2Responses.empty()) if (!_smtlib2Responses.empty())
m_errorReporter.warning( m_errorReporter.warning(
"Query responses for smtlib2 were given in the auxiliary input, " "SMT-LIB2 query responses were given in the auxiliary input, "
"but this Solidity binary uses an SMT solver directly." "but this Solidity binary uses an SMT solver (Z3/CVC4) directly."
"These responses will be ignored."
"Consider disabling Z3/CVC4 at compilation time in order to use SMT-LIB2 responses."
); );
#endif #endif
(void)_smtlib2Responses; (void)_smtlib2Responses;