cerc-io/solidity
11
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

[SMTChecker] Fix ICE when reporting cex concerning state vars from different source files

Browse Source
This commit is contained in:
Leonardo Alt
2019-08-10 20:56:52 +02:00
parent 67c855e93e
commit 4214cd1354
11 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/formal/BMC.cpp
+2 -7
View File
@@ -43,12 +43,10 @@ BMC::BMC(smt::EncodingContext& _context, ErrorReporter& _errorReporter, map<h256
#endif
}
void BMC::analyze(SourceUnit const& _source, shared_ptr<Scanner> const& _scanner, set<Expression const*> _safeAssertions)
void BMC::analyze(SourceUnit const& _source, set<Expression const*> _safeAssertions)
{
solAssert(_source.annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker), "");
m_scanner = _scanner;
m_safeAssertions += move(_safeAssertions);
m_context.setSolver(m_interface);
m_context.clear();
@@ -542,7 +540,7 @@ pair<vector<smt::Expression>, vector<string>> BMC::modelExpressions()
if (uf->annotation().type->isValueType())
{
expressionsToEvaluate.emplace_back(expr(*uf));
expressionNames.push_back(m_scanner->sourceAt(uf->location()));
expressionNames.push_back(uf->location().text());
}
return {expressionsToEvaluate, expressionNames};
@@ -717,14 +715,11 @@ void BMC::checkCondition(
vector<string> expressionNames;
tie(expressionsToEvaluate, expressionNames) = _modelExpressions;
if (callStack.size())
{
solAssert(m_scanner, "");
if (_additionalValue)
{
expressionsToEvaluate.emplace_back(*_additionalValue);
expressionNames.push_back(_additionalValueName);
}
}
smt::CheckResult result;
vector<string> values;
tie(result, values) = checkSatisfiableAndGenerateModel(expressionsToEvaluate);
libsolidity/formal/BMC.h
+1 -2
View File
@@ -34,7 +34,6 @@
#include <libsolidity/interface/ReadFile.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>
#include <set>
#include <string>
@@ -56,7 +55,7 @@ class BMC: public SMTEncoder
public:
BMC(smt::EncodingContext& _context, langutil::ErrorReporter& _errorReporter, std::map<h256, std::string> const& _smtlib2Responses);
void analyze(SourceUnit const& _sources, std::shared_ptr<langutil::Scanner> const& _scanner, std::set<Expression const*> _safeAssertions);
void analyze(SourceUnit const& _sources, std::set<Expression const*> _safeAssertions);
/// This is used if the SMT solver is not directly linked into this binary.
/// @returns a list of inputs to the SMT solver that were not part of the argument to
libsolidity/formal/CHC.cpp
+1 -3
View File
@@ -39,12 +39,10 @@ CHC::CHC(smt::EncodingContext& _context, ErrorReporter& _errorReporter):
{
}
void CHC::analyze(SourceUnit const& _source, shared_ptr<Scanner> const& _scanner)
void CHC::analyze(SourceUnit const& _source)
{
solAssert(_source.annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker), "");
m_scanner = _scanner;
#ifdef HAVE_Z3
auto z3Interface = dynamic_pointer_cast<smt::Z3CHCInterface>(m_interface);
solAssert(z3Interface, "");
libsolidity/formal/CHC.h
+1 -1
View File
@@ -46,7 +46,7 @@ class CHC: public SMTEncoder
public:
CHC(smt::EncodingContext& _context, langutil::ErrorReporter& _errorReporter);
void analyze(SourceUnit const& _sources, std::shared_ptr<langutil::Scanner> const& _scanner);
void analyze(SourceUnit const& _sources);
std::set<Expression const*> const& safeAssertions() const { return m_safeAssertions; }
libsolidity/formal/ModelChecker.cpp
+3 -3
View File
@@ -29,13 +29,13 @@ ModelChecker::ModelChecker(ErrorReporter& _errorReporter, map<h256, string> cons
{
}
void ModelChecker::analyze(SourceUnit const& _source, shared_ptr<Scanner> const& _scanner)
void ModelChecker::analyze(SourceUnit const& _source)
{
if (!_source.annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker))
return;
m_chc.analyze(_source, _scanner);
m_bmc.analyze(_source, _scanner, m_chc.safeAssertions());
m_chc.analyze(_source);
m_bmc.analyze(_source, m_chc.safeAssertions());
}
vector<string> ModelChecker::unhandledQueries()
libsolidity/formal/ModelChecker.h
+1 -2
View File
@@ -28,7 +28,6 @@
#include <libsolidity/interface/ReadFile.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>
namespace langutil
{
@@ -46,7 +45,7 @@ class ModelChecker
public:
ModelChecker(langutil::ErrorReporter& _errorReporter, std::map<h256, std::string> const& _smtlib2Responses);
void analyze(SourceUnit const& _sources, std::shared_ptr<langutil::Scanner> const& _scanner);
void analyze(SourceUnit const& _sources);
/// This is used if the SMT solver is not directly linked into this binary.
/// @returns a list of inputs to the SMT solver that were not part of the argument to
libsolidity/formal/SMTEncoder.h
-2
View File
@@ -30,7 +30,6 @@
#include <libsolidity/ast/ASTVisitor.h>
#include <libsolidity/interface/ReadFile.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>
#include <string>
#include <unordered_map>
@@ -231,7 +230,6 @@ protected:
/// warning before the others in case it's needed.
langutil::ErrorReporter m_errorReporter;
langutil::ErrorList m_smtErrors;
std::shared_ptr<langutil::Scanner> m_scanner;
/// Stores the current function/modifier call/invocation path.
std::vector<CallStackEntry> m_callStack;
libsolidity/interface/CompilerStack.cpp
+1 -1
View File
@@ -373,7 +373,7 @@ bool CompilerStack::analyze()
{
ModelChecker modelChecker(m_errorReporter, m_smtlib2Responses);
for (Source const* source: m_sourceOrder)
modelChecker.analyze(*source->ast, source->scanner);
modelChecker.analyze(*source->ast);
m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
}
}