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

Merge remote-tracking branch 'origin/develop' into develop_060

Browse Source
This commit is contained in:
chriseth 2019-12-03 21:17:15 +01:00
commit 2f11ac3590
31 changed files with 202 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -59,6 +59,7 @@ Build System:
Bugfixes: Bugfixes:
* SMTChecker: Fix internal error when using ``abi.decode``. * SMTChecker: Fix internal error when using ``abi.decode``.
* SMTChecker: Fix internal error when using arrays or mappings of functions. * SMTChecker: Fix internal error when using arrays or mappings of functions.
* SMTChecker: Fix internal error in array of structs type.

1
docs/index.rst
View File

@ -66,6 +66,7 @@ They have varying degrees of completeness and up-to-dateness. The English
version stands as a reference. version stands as a reference.
* `French <http://solidity-fr.readthedocs.io>`_ (in progress) * `French <http://solidity-fr.readthedocs.io>`_ (in progress)
* `Italian <https://github.com/damianoazzolini/solidity>`_ (in progress)
* `Japanese <https://solidity-jp.readthedocs.io>`_ * `Japanese <https://solidity-jp.readthedocs.io>`_
* `Korean <http://solidity-kr.readthedocs.io>`_ (in progress) * `Korean <http://solidity-kr.readthedocs.io>`_ (in progress)
* `Russian <https://github.com/ethereum/wiki/wiki/%5BRussian%5D-%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-Solidity>`_ (rather outdated) * `Russian <https://github.com/ethereum/wiki/wiki/%5BRussian%5D-%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-Solidity>`_ (rather outdated)

12
libdevcore/JSON.cpp
View File

@ -111,16 +111,4 @@ bool jsonParseStrict(string const& _input, Json::Value& _json, string* _errs /*
return parse(readerBuilder, _input, _json, _errs); return parse(readerBuilder, _input, _json, _errs);
} }
bool jsonParse(string const& _input, Json::Value& _json, string *_errs /* = nullptr */)
{
static Json::CharReaderBuilder readerBuilder;
return parse(readerBuilder, _input, _json, _errs);
}
bool jsonParseFile(string const& _fileName, Json::Value& _json, string *_errs /* = nullptr */)
{
return jsonParse(readFileAsString(_fileName), _json, _errs);
}
} // namespace dev } // namespace dev

14
libdevcore/JSON.h
View File

@ -41,18 +41,4 @@ std::string jsonCompactPrint(Json::Value const& _input);
/// \return \c true if the document was successfully parsed, \c false if an error occurred. /// \return \c true if the document was successfully parsed, \c false if an error occurred.
bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr); bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
/// Parse a JSON string (@a _input) and writes resulting JSON object to (@a _json)
/// \param _input JSON input string
/// \param _json [out] resulting JSON object
/// \param _errs [out] Formatted error messages
/// \return \c true if the document was successfully parsed, \c false if an error occurred.
bool jsonParse(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
/// Parse a JSON string (@a _input) and writes resulting JSON object to (@a _json)
/// \param _input file containing JSON input
/// \param _json [out] resulting JSON object
/// \param _errs [out] Formatted error messages
/// \return \c true if the document was successfully parsed, \c false if an error occurred.
bool jsonParseFile(std::string const& _fileName, Json::Value& _json, std::string* _errs = nullptr);
} }

10
libsolidity/formal/SMTEncoder.cpp
View File

@ -870,8 +870,11 @@ void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
{ {
createExpr(_indexAccess); createExpr(_indexAccess);
if (_indexAccess.annotation().type->category() == Type::Category::TypeType)
return;
shared_ptr<smt::SymbolicVariable> array; shared_ptr<smt::SymbolicVariable> array;
if (auto const& id = dynamic_cast<Identifier const*>(&_indexAccess.baseExpression())) if (auto const* id = dynamic_cast<Identifier const*>(&_indexAccess.baseExpression()))
{ {
auto varDecl = identifierToVariable(*id); auto varDecl = identifierToVariable(*id);
solAssert(varDecl, ""); solAssert(varDecl, "");
@ -886,7 +889,7 @@ void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
return; return;
} }
} }
else if (auto const& innerAccess = dynamic_cast<IndexAccess const*>(&_indexAccess.baseExpression())) else if (auto const* innerAccess = dynamic_cast<IndexAccess const*>(&_indexAccess.baseExpression()))
{ {
solAssert(m_context.knownExpression(*innerAccess), ""); solAssert(m_context.knownExpression(*innerAccess), "");
array = m_context.expression(*innerAccess); array = m_context.expression(*innerAccess);
@ -900,9 +903,6 @@ void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
return; return;
} }
if (_indexAccess.annotation().type->category() == Type::Category::TypeType)
return;
solAssert(array, ""); solAssert(array, "");
defineExpr(_indexAccess, smt::Expression::select( defineExpr(_indexAccess, smt::Expression::select(
array->currentValue(), array->currentValue(),

11
libsolidity/interface/StandardCompiler.cpp
View File

@ -24,6 +24,7 @@
#include <libsolidity/ast/ASTJsonConverter.h> #include <libsolidity/ast/ASTJsonConverter.h>
#include <libyul/AssemblyStack.h> #include <libyul/AssemblyStack.h>
#include <libyul/Exceptions.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatter.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
@ -857,6 +858,16 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
"Unimplemented feature (" + _exception.lineInfo() + ")" "Unimplemented feature (" + _exception.lineInfo() + ")"
)); ));
} }
catch (yul::YulException const& _exception)
{
errors.append(formatErrorWithException(
_exception,
false,
"YulException",
"general",
"Yul exception"
));
}
catch (Exception const& _exception) catch (Exception const& _exception)
{ {
errors.append(formatError( errors.append(formatError(

40
libyul/AsmAnalysis.cpp
View File

@ -60,12 +60,12 @@ bool AsmAnalyzer::analyze(Block const& _block)
success = (*this)(_block); success = (*this)(_block);
if (!success) if (!success)
solAssert(m_errorReporter.hasErrors(), "No success but no error."); yulAssert(m_errorReporter.hasErrors(), "No success but no error.");
} }
catch (FatalError const&) catch (FatalError const&)
{ {
// This FatalError con occur if the errorReporter has too many errors. // This FatalError con occur if the errorReporter has too many errors.
solAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported."); yulAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
} }
return success && !m_errorReporter.hasErrors(); return success && !m_errorReporter.hasErrors();
} }
@ -82,13 +82,13 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect,
{}, {},
_object.dataNames() _object.dataNames()
).analyze(*_object.code); ).analyze(*_object.code);
solAssert(success && errorList.empty(), "Invalid assembly/yul code."); yulAssert(success && errorList.empty(), "Invalid assembly/yul code.");
return analysisInfo; return analysisInfo;
} }
bool AsmAnalyzer::operator()(yul::Instruction const& _instruction) bool AsmAnalyzer::operator()(yul::Instruction const& _instruction)
{ {
solAssert(false, "The use of non-functional instructions is disallowed. Please use functional notation instead."); yulAssert(false, "The use of non-functional instructions is disallowed. Please use functional notation instead.");
auto const& info = instructionInfo(_instruction.instruction); auto const& info = instructionInfo(_instruction.instruction);
m_stackHeight += info.ret - info.args; m_stackHeight += info.ret - info.args;
m_info.stackHeightInfo[&_instruction] = m_stackHeight; m_info.stackHeightInfo[&_instruction] = m_stackHeight;
@ -118,8 +118,8 @@ bool AsmAnalyzer::operator()(Literal const& _literal)
} }
else if (_literal.kind == LiteralKind::Boolean) else if (_literal.kind == LiteralKind::Boolean)
{ {
solAssert(m_dialect.flavour == AsmFlavour::Yul, ""); yulAssert(m_dialect.flavour == AsmFlavour::Yul, "");
solAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, ""); yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "");
} }
m_info.stackHeightInfo[&_literal] = m_stackHeight; m_info.stackHeightInfo[&_literal] = m_stackHeight;
return true; return true;
@ -127,7 +127,7 @@ bool AsmAnalyzer::operator()(Literal const& _literal)
bool AsmAnalyzer::operator()(Identifier const& _identifier) bool AsmAnalyzer::operator()(Identifier const& _identifier)
{ {
solAssert(!_identifier.name.empty(), ""); yulAssert(!_identifier.name.empty(), "");
size_t numErrorsBefore = m_errorReporter.errors().size(); size_t numErrorsBefore = m_errorReporter.errors().size();
bool success = true; bool success = true;
if (m_currentScope->lookup(_identifier.name, GenericVisitor{ if (m_currentScope->lookup(_identifier.name, GenericVisitor{
@ -200,9 +200,9 @@ bool AsmAnalyzer::operator()(ExpressionStatement const& _statement)
bool AsmAnalyzer::operator()(Assignment const& _assignment) bool AsmAnalyzer::operator()(Assignment const& _assignment)
{ {
solAssert(_assignment.value, ""); yulAssert(_assignment.value, "");
int const expectedItems = _assignment.variableNames.size(); int const expectedItems = _assignment.variableNames.size();
solAssert(expectedItems >= 1, ""); yulAssert(expectedItems >= 1, "");
int const stackHeight = m_stackHeight; int const stackHeight = m_stackHeight;
bool success = std::visit(*this, *_assignment.value); bool success = std::visit(*this, *_assignment.value);
if ((m_stackHeight - stackHeight) != expectedItems) if ((m_stackHeight - stackHeight) != expectedItems)
@ -269,9 +269,9 @@ bool AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
bool AsmAnalyzer::operator()(FunctionDefinition const& _funDef) bool AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
{ {
solAssert(!_funDef.name.empty(), ""); yulAssert(!_funDef.name.empty(), "");
Block const* virtualBlock = m_info.virtualBlocks.at(&_funDef).get(); Block const* virtualBlock = m_info.virtualBlocks.at(&_funDef).get();
solAssert(virtualBlock, ""); yulAssert(virtualBlock, "");
Scope& varScope = scope(virtualBlock); Scope& varScope = scope(virtualBlock);
for (auto const& var: _funDef.parameters + _funDef.returnVariables) for (auto const& var: _funDef.parameters + _funDef.returnVariables)
{ {
@ -291,7 +291,7 @@ bool AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
bool AsmAnalyzer::operator()(FunctionCall const& _funCall) bool AsmAnalyzer::operator()(FunctionCall const& _funCall)
{ {
solAssert(!_funCall.functionName.name.empty(), ""); yulAssert(!_funCall.functionName.name.empty(), "");
bool success = true; bool success = true;
size_t parameters = 0; size_t parameters = 0;
size_t returns = 0; size_t returns = 0;
@ -390,7 +390,7 @@ bool AsmAnalyzer::operator()(If const& _if)
bool AsmAnalyzer::operator()(Switch const& _switch) bool AsmAnalyzer::operator()(Switch const& _switch)
{ {
solAssert(_switch.expression, ""); yulAssert(_switch.expression, "");
bool success = true; bool success = true;
@ -462,7 +462,7 @@ bool AsmAnalyzer::operator()(Switch const& _switch)
bool AsmAnalyzer::operator()(ForLoop const& _for) bool AsmAnalyzer::operator()(ForLoop const& _for)
{ {
solAssert(_for.condition, ""); yulAssert(_for.condition, "");
Scope* outerScope = m_currentScope; Scope* outerScope = m_currentScope;
@ -579,7 +579,7 @@ bool AsmAnalyzer::expectDeposit(int _deposit, int _oldHeight, SourceLocation con
bool AsmAnalyzer::checkAssignment(Identifier const& _variable, size_t _valueSize) bool AsmAnalyzer::checkAssignment(Identifier const& _variable, size_t _valueSize)
{ {
solAssert(!_variable.name.empty(), ""); yulAssert(!_variable.name.empty(), "");
bool success = true; bool success = true;
size_t numErrorsBefore = m_errorReporter.errors().size(); size_t numErrorsBefore = m_errorReporter.errors().size();
size_t variableSize(-1); size_t variableSize(-1);
@ -635,9 +635,9 @@ bool AsmAnalyzer::checkAssignment(Identifier const& _variable, size_t _valueSize
Scope& AsmAnalyzer::scope(Block const* _block) Scope& AsmAnalyzer::scope(Block const* _block)
{ {
solAssert(m_info.scopes.count(_block) == 1, "Scope requested but not present."); yulAssert(m_info.scopes.count(_block) == 1, "Scope requested but not present.");
auto scopePtr = m_info.scopes.at(_block); auto scopePtr = m_info.scopes.at(_block);
solAssert(scopePtr, "Scope requested but not present."); yulAssert(scopePtr, "Scope requested but not present.");
return *scopePtr; return *scopePtr;
} }
void AsmAnalyzer::expectValidType(string const& type, SourceLocation const& _location) void AsmAnalyzer::expectValidType(string const& type, SourceLocation const& _location)
@ -665,10 +665,10 @@ bool AsmAnalyzer::warnOnInstructions(dev::eth::Instruction _instr, SourceLocatio
{ {
// We assume that returndatacopy, returndatasize and staticcall are either all available // We assume that returndatacopy, returndatasize and staticcall are either all available
// or all not available. // or all not available.
solAssert(m_evmVersion.supportsReturndata() == m_evmVersion.hasStaticCall(), ""); yulAssert(m_evmVersion.supportsReturndata() == m_evmVersion.hasStaticCall(), "");
// Similarly we assume bitwise shifting and create2 go together. // Similarly we assume bitwise shifting and create2 go together.
solAssert(m_evmVersion.hasBitwiseShifting() == m_evmVersion.hasCreate2(), ""); yulAssert(m_evmVersion.hasBitwiseShifting() == m_evmVersion.hasCreate2(), "");
solAssert(m_dialect.flavour != AsmFlavour::Yul, ""); yulAssert(m_dialect.flavour != AsmFlavour::Yul, "");
auto errorForVM = [=](string const& vmKindMessage) { auto errorForVM = [=](string const& vmKindMessage) {
m_errorReporter.typeError( m_errorReporter.typeError(

2
libyul/AsmAnalysisInfo.h
View File

@ -22,8 +22,6 @@
#include <libyul/AsmDataForward.h> #include <libyul/AsmDataForward.h>
#include <boost/variant.hpp>
#include <map> #include <map>
#include <memory> #include <memory>
#include <vector> #include <vector>

9
libyul/AsmParser.cpp
View File

@ -21,6 +21,7 @@
*/ */
#include <libyul/AsmParser.h> #include <libyul/AsmParser.h>
#include <libyul/Exceptions.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <libdevcore/Common.h> #include <libdevcore/Common.h>
@ -52,7 +53,7 @@ shared_ptr<Block> Parser::parse(std::shared_ptr<Scanner> const& _scanner, bool _
} }
catch (FatalError const&) catch (FatalError const&)
{ {
solAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported."); yulAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
} }
return nullptr; return nullptr;
@ -232,7 +233,7 @@ Statement Parser::parseStatement()
} }
else else
{ {
solAssert(false, "Invalid elementary operation."); yulAssert(false, "Invalid elementary operation.");
return {}; return {};
} }
} }
@ -252,7 +253,7 @@ Case Parser::parseCase()
_case.value = make_unique<Literal>(std::get<Literal>(std::move(literal))); _case.value = make_unique<Literal>(std::get<Literal>(std::move(literal)));
} }
else else
solAssert(false, "Case or default case expected."); yulAssert(false, "Case or default case expected.");
_case.body = parseBlock(); _case.body = parseBlock();
_case.location.end = _case.body.location.end; _case.location.end = _case.body.location.end;
return _case; return _case;
@ -292,7 +293,7 @@ Expression Parser::parseExpression()
return std::get<Identifier>(operation); return std::get<Identifier>(operation);
else else
{ {
solAssert(holds_alternative<Literal>(operation), ""); yulAssert(holds_alternative<Literal>(operation), "");
return std::get<Literal>(operation); return std::get<Literal>(operation);
} }
} }

20
libyul/AsmPrinter.cpp
View File

@ -22,7 +22,7 @@
#include <libyul/AsmPrinter.h> #include <libyul/AsmPrinter.h>
#include <libyul/AsmData.h> #include <libyul/AsmData.h>
#include <liblangutil/Exceptions.h> #include <libyul/Exceptions.h>
#include <libdevcore/CommonData.h> #include <libdevcore/CommonData.h>
@ -44,10 +44,10 @@ string AsmPrinter::operator()(Literal const& _literal) const
switch (_literal.kind) switch (_literal.kind)
{ {
case LiteralKind::Number: case LiteralKind::Number:
solAssert(isValidDecimal(_literal.value.str()) || isValidHex(_literal.value.str()), "Invalid number literal"); yulAssert(isValidDecimal(_literal.value.str()) || isValidHex(_literal.value.str()), "Invalid number literal");
return _literal.value.str() + appendTypeName(_literal.type); return _literal.value.str() + appendTypeName(_literal.type);
case LiteralKind::Boolean: case LiteralKind::Boolean:
solAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "Invalid bool literal."); yulAssert(_literal.value == "true"_yulstring || _literal.value == "false"_yulstring, "Invalid bool literal.");
return ((_literal.value == "true"_yulstring) ? "true" : "false") + appendTypeName(_literal.type); return ((_literal.value == "true"_yulstring) ? "true" : "false") + appendTypeName(_literal.type);
case LiteralKind::String: case LiteralKind::String:
break; break;
@ -84,7 +84,7 @@ string AsmPrinter::operator()(Literal const& _literal) const
string AsmPrinter::operator()(Identifier const& _identifier) const string AsmPrinter::operator()(Identifier const& _identifier) const
{ {
solAssert(!_identifier.name.empty(), "Invalid identifier."); yulAssert(!_identifier.name.empty(), "Invalid identifier.");
return _identifier.name.str(); return _identifier.name.str();
} }
@ -95,7 +95,7 @@ string AsmPrinter::operator()(ExpressionStatement const& _statement) const
string AsmPrinter::operator()(Assignment const& _assignment) const string AsmPrinter::operator()(Assignment const& _assignment) const
{ {
solAssert(_assignment.variableNames.size() >= 1, ""); yulAssert(_assignment.variableNames.size() >= 1, "");
string variables = (*this)(_assignment.variableNames.front()); string variables = (*this)(_assignment.variableNames.front());
for (size_t i = 1; i < _assignment.variableNames.size(); ++i) for (size_t i = 1; i < _assignment.variableNames.size(); ++i)
variables += ", " + (*this)(_assignment.variableNames[i]); variables += ", " + (*this)(_assignment.variableNames[i]);
@ -121,7 +121,7 @@ string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration) c
string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition) const string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition) const
{ {
solAssert(!_functionDefinition.name.empty(), "Invalid function name."); yulAssert(!_functionDefinition.name.empty(), "Invalid function name.");
string out = "function " + _functionDefinition.name.str() + "("; string out = "function " + _functionDefinition.name.str() + "(";
out += boost::algorithm::join( out += boost::algorithm::join(
_functionDefinition.parameters | boost::adaptors::transformed( _functionDefinition.parameters | boost::adaptors::transformed(
@ -156,7 +156,7 @@ string AsmPrinter::operator()(FunctionCall const& _functionCall) const
string AsmPrinter::operator()(If const& _if) const string AsmPrinter::operator()(If const& _if) const
{ {
solAssert(_if.condition, "Invalid if condition."); yulAssert(_if.condition, "Invalid if condition.");
string body = (*this)(_if.body); string body = (*this)(_if.body);
char delim = '\n'; char delim = '\n';
if (body.find('\n') == string::npos) if (body.find('\n') == string::npos)
@ -166,7 +166,7 @@ string AsmPrinter::operator()(If const& _if) const
string AsmPrinter::operator()(Switch const& _switch) const string AsmPrinter::operator()(Switch const& _switch) const
{ {
solAssert(_switch.expression, "Invalid expression pointer."); yulAssert(_switch.expression, "Invalid expression pointer.");
string out = "switch " + std::visit(*this, *_switch.expression); string out = "switch " + std::visit(*this, *_switch.expression);
for (auto const& _case: _switch.cases) for (auto const& _case: _switch.cases)
{ {
@ -181,7 +181,7 @@ string AsmPrinter::operator()(Switch const& _switch) const
string AsmPrinter::operator()(ForLoop const& _forLoop) const string AsmPrinter::operator()(ForLoop const& _forLoop) const
{ {
solAssert(_forLoop.condition, "Invalid for loop condition."); yulAssert(_forLoop.condition, "Invalid for loop condition.");
string pre = (*this)(_forLoop.pre); string pre = (*this)(_forLoop.pre);
string condition = std::visit(*this, *_forLoop.condition); string condition = std::visit(*this, *_forLoop.condition);
string post = (*this)(_forLoop.post); string post = (*this)(_forLoop.post);
@ -231,7 +231,7 @@ string AsmPrinter::operator()(Block const& _block) const
string AsmPrinter::formatTypedName(TypedName _variable) const string AsmPrinter::formatTypedName(TypedName _variable) const
{ {
solAssert(!_variable.name.empty(), "Invalid variable name."); yulAssert(!_variable.name.empty(), "Invalid variable name.");
return _variable.name.str() + appendTypeName(_variable.type); return _variable.name.str() + appendTypeName(_variable.type);
} }

4
libyul/AsmScopeFiller.cpp
View File

@ -23,9 +23,9 @@
#include <libyul/AsmData.h> #include <libyul/AsmData.h>
#include <libyul/AsmScope.h> #include <libyul/AsmScope.h>
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
#include <libyul/Exceptions.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/Exceptions.h>
#include <libdevcore/CommonData.h> #include <libdevcore/CommonData.h>
@ -74,7 +74,7 @@ bool ScopeFiller::operator()(FunctionDefinition const& _funDef)
if (!(*this)(_funDef.body)) if (!(*this)(_funDef.body))
success = false; success = false;
solAssert(m_currentScope == &varScope, ""); yulAssert(m_currentScope == &varScope, "");
m_currentScope = m_currentScope->superScope; m_currentScope = m_currentScope->superScope;
return success; return success;

42
libyul/AssemblyStack.cpp
View File

@ -62,7 +62,7 @@ Dialect const& languageToDialect(AssemblyStack::Language _language, EVMVersion _
case AssemblyStack::Language::EWasm: case AssemblyStack::Language::EWasm:
return WasmDialect::instance(); return WasmDialect::instance();
} }
solAssert(false, ""); yulAssert(false, "");
return Dialect::yul(); return Dialect::yul();
} }
@ -71,7 +71,7 @@ Dialect const& languageToDialect(AssemblyStack::Language _language, EVMVersion _
Scanner const& AssemblyStack::scanner() const Scanner const& AssemblyStack::scanner() const
{ {
solAssert(m_scanner, ""); yulAssert(m_scanner, "");
return *m_scanner; return *m_scanner;
} }
@ -83,8 +83,8 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
m_parserResult = ObjectParser(m_errorReporter, languageToDialect(m_language, m_evmVersion)).parse(m_scanner, false); m_parserResult = ObjectParser(m_errorReporter, languageToDialect(m_language, m_evmVersion)).parse(m_scanner, false);
if (!m_errorReporter.errors().empty()) if (!m_errorReporter.errors().empty())
return false; return false;
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
solAssert(m_parserResult->code, ""); yulAssert(m_parserResult->code, "");
return analyzeParsed(); return analyzeParsed();
} }
@ -94,12 +94,12 @@ void AssemblyStack::optimize()
if (!m_optimiserSettings.runYulOptimiser) if (!m_optimiserSettings.runYulOptimiser)
return; return;
solAssert(m_analysisSuccessful, "Analysis was not successful."); yulAssert(m_analysisSuccessful, "Analysis was not successful.");
m_analysisSuccessful = false; m_analysisSuccessful = false;
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
optimize(*m_parserResult, true); optimize(*m_parserResult, true);
solAssert(analyzeParsed(), "Invalid source code after optimization."); yulAssert(analyzeParsed(), "Invalid source code after optimization.");
} }
void AssemblyStack::translate(AssemblyStack::Language _targetLanguage) void AssemblyStack::translate(AssemblyStack::Language _targetLanguage)
@ -121,14 +121,14 @@ void AssemblyStack::translate(AssemblyStack::Language _targetLanguage)
bool AssemblyStack::analyzeParsed() bool AssemblyStack::analyzeParsed()
{ {
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
m_analysisSuccessful = analyzeParsed(*m_parserResult); m_analysisSuccessful = analyzeParsed(*m_parserResult);
return m_analysisSuccessful; return m_analysisSuccessful;
} }
bool AssemblyStack::analyzeParsed(Object& _object) bool AssemblyStack::analyzeParsed(Object& _object)
{ {
solAssert(_object.code, ""); yulAssert(_object.code, "");
_object.analysisInfo = make_shared<AsmAnalysisInfo>(); _object.analysisInfo = make_shared<AsmAnalysisInfo>();
AsmAnalyzer analyzer( AsmAnalyzer analyzer(
@ -168,8 +168,8 @@ void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _evm15, bool _o
void AssemblyStack::optimize(Object& _object, bool _isCreation) void AssemblyStack::optimize(Object& _object, bool _isCreation)
{ {
solAssert(_object.code, ""); yulAssert(_object.code, "");
solAssert(_object.analysisInfo, ""); yulAssert(_object.analysisInfo, "");
for (auto& subNode: _object.subObjects) for (auto& subNode: _object.subObjects)
if (auto subObject = dynamic_cast<Object*>(subNode.get())) if (auto subObject = dynamic_cast<Object*>(subNode.get()))
optimize(*subObject, false); optimize(*subObject, false);
@ -188,10 +188,10 @@ void AssemblyStack::optimize(Object& _object, bool _isCreation)
MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
{ {
solAssert(m_analysisSuccessful, ""); yulAssert(m_analysisSuccessful, "");
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
solAssert(m_parserResult->code, ""); yulAssert(m_parserResult->code, "");
solAssert(m_parserResult->analysisInfo, ""); yulAssert(m_parserResult->analysisInfo, "");
switch (_machine) switch (_machine)
{ {
@ -216,7 +216,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
} }
case Machine::eWasm: case Machine::eWasm:
{ {
solAssert(m_language == Language::EWasm, ""); yulAssert(m_language == Language::EWasm, "");
Dialect const& dialect = languageToDialect(m_language, EVMVersion{}); Dialect const& dialect = languageToDialect(m_language, EVMVersion{});
MachineAssemblyObject object; MachineAssemblyObject object;
@ -233,15 +233,15 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
string AssemblyStack::print() const string AssemblyStack::print() const
{ {
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
solAssert(m_parserResult->code, ""); yulAssert(m_parserResult->code, "");
return m_parserResult->toString(m_language == Language::Yul) + "\n"; return m_parserResult->toString(m_language == Language::Yul) + "\n";
} }
shared_ptr<Object> AssemblyStack::parserResult() const shared_ptr<Object> AssemblyStack::parserResult() const
{ {
solAssert(m_analysisSuccessful, "Analysis was not successful."); yulAssert(m_analysisSuccessful, "Analysis was not successful.");
solAssert(m_parserResult, ""); yulAssert(m_parserResult, "");
solAssert(m_parserResult->code, ""); yulAssert(m_parserResult->code, "");
return m_parserResult; return m_parserResult;
} }

4
libyul/CompilabilityChecker.cpp
View File

@ -41,7 +41,7 @@ map<YulString, int> CompilabilityChecker::run(
if (_dialect.flavour == AsmFlavour::Yul) if (_dialect.flavour == AsmFlavour::Yul)
return {}; return {};
solAssert(_dialect.flavour == AsmFlavour::Strict, ""); yulAssert(_dialect.flavour == AsmFlavour::Strict, "");
if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect)) if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
{ {
@ -69,7 +69,7 @@ map<YulString, int> CompilabilityChecker::run(
} }
catch (StackTooDeepError const&) catch (StackTooDeepError const&)
{ {
solAssert(!transform.stackErrors().empty(), "Got stack too deep exception that was not stored."); yulAssert(!transform.stackErrors().empty(), "Got stack too deep exception that was not stored.");
} }
std::map<YulString, int> functions; std::map<YulString, int> functions;

2
libyul/Exceptions.h
View File

@ -33,6 +33,6 @@ struct YulAssertion: virtual YulException {};
/// Assertion that throws an YulAssertion containing the given description if it is not met. /// Assertion that throws an YulAssertion containing the given description if it is not met.
#define yulAssert(CONDITION, DESCRIPTION) \ #define yulAssert(CONDITION, DESCRIPTION) \
assertThrow(CONDITION, ::yul::YulException, DESCRIPTION) assertThrow(CONDITION, ::yul::YulAssertion, DESCRIPTION)
} }

2
libyul/ObjectParser.cpp
View File

@ -112,7 +112,7 @@ shared_ptr<Block> ObjectParser::parseBlock()
void ObjectParser::parseData(Object& _containingObject) void ObjectParser::parseData(Object& _containingObject)
{ {
solAssert( yulAssert(
currentToken() == Token::Identifier && currentLiteral() == "data", currentToken() == Token::Identifier && currentLiteral() == "data",
"parseData called on wrong input." "parseData called on wrong input."
); );

12
libyul/backends/evm/AsmCodeGen.cpp
View File

@ -118,19 +118,19 @@ void EthAssemblyAdapter::appendJumpToIf(LabelID _labelId)
void EthAssemblyAdapter::appendBeginsub(LabelID, int) void EthAssemblyAdapter::appendBeginsub(LabelID, int)
{ {
// TODO we could emulate that, though // TODO we could emulate that, though
solAssert(false, "BEGINSUB not implemented for EVM 1.0"); yulAssert(false, "BEGINSUB not implemented for EVM 1.0");
} }
void EthAssemblyAdapter::appendJumpsub(LabelID, int, int) void EthAssemblyAdapter::appendJumpsub(LabelID, int, int)
{ {
// TODO we could emulate that, though // TODO we could emulate that, though
solAssert(false, "JUMPSUB not implemented for EVM 1.0"); yulAssert(false, "JUMPSUB not implemented for EVM 1.0");
} }
void EthAssemblyAdapter::appendReturnsub(int, int) void EthAssemblyAdapter::appendReturnsub(int, int)
{ {
// TODO we could emulate that, though // TODO we could emulate that, though
solAssert(false, "RETURNSUB not implemented for EVM 1.0"); yulAssert(false, "RETURNSUB not implemented for EVM 1.0");
} }
void EthAssemblyAdapter::appendAssemblySize() void EthAssemblyAdapter::appendAssemblySize()
@ -174,7 +174,7 @@ AbstractAssembly::SubID EthAssemblyAdapter::appendData(bytes const& _data)
EthAssemblyAdapter::LabelID EthAssemblyAdapter::assemblyTagToIdentifier(eth::AssemblyItem const& _tag) EthAssemblyAdapter::LabelID EthAssemblyAdapter::assemblyTagToIdentifier(eth::AssemblyItem const& _tag)
{ {
u256 id = _tag.data(); u256 id = _tag.data();
solAssert(id <= std::numeric_limits<LabelID>::max(), "Tag id too large."); yulAssert(id <= std::numeric_limits<LabelID>::max(), "Tag id too large.");
return LabelID(id); return LabelID(id);
} }
@ -207,11 +207,11 @@ void CodeGenerator::assemble(
} }
catch (StackTooDeepError const& _e) catch (StackTooDeepError const& _e)
{ {
solAssert( yulAssert(
false, false,
"Stack too deep when compiling inline assembly" + "Stack too deep when compiling inline assembly" +
(_e.comment() ? ": " + *_e.comment() : ".") (_e.comment() ? ": " + *_e.comment() : ".")
); );
} }
solAssert(transform.stackErrors().empty(), "Stack errors present but not thrown."); yulAssert(transform.stackErrors().empty(), "Stack errors present but not thrown.");
} }

43
libyul/backends/evm/EVMAssembly.cpp
View File

@ -19,11 +19,10 @@
*/ */
#include <libyul/backends/evm/EVMAssembly.h> #include <libyul/backends/evm/EVMAssembly.h>
#include <libyul/Exceptions.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <liblangutil/Exceptions.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace dev::eth; using namespace dev::eth;
@ -65,7 +64,7 @@ void EVMAssembly::appendLabel(LabelID _labelId)
void EVMAssembly::appendLabelReference(LabelID _labelId) void EVMAssembly::appendLabelReference(LabelID _labelId)
{ {
solAssert(!m_evm15, "Cannot use plain label references in EMV1.5 mode."); yulAssert(!m_evm15, "Cannot use plain label references in EMV1.5 mode.");
// @TODO we now always use labelReferenceSize for all labels, it could be shortened // @TODO we now always use labelReferenceSize for all labels, it could be shortened
// for some of them. // for some of them.
appendInstruction(dev::eth::pushInstruction(labelReferenceSize)); appendInstruction(dev::eth::pushInstruction(labelReferenceSize));
@ -81,7 +80,7 @@ EVMAssembly::LabelID EVMAssembly::newLabelId()
AbstractAssembly::LabelID EVMAssembly::namedLabel(string const& _name) AbstractAssembly::LabelID EVMAssembly::namedLabel(string const& _name)
{ {
solAssert(!_name.empty(), ""); yulAssert(!_name.empty(), "");
if (!m_namedLabels.count(_name)) if (!m_namedLabels.count(_name))
m_namedLabels[_name] = newLabelId(); m_namedLabels[_name] = newLabelId();
return m_namedLabels[_name]; return m_namedLabels[_name];
@ -89,12 +88,12 @@ AbstractAssembly::LabelID EVMAssembly::namedLabel(string const& _name)
void EVMAssembly::appendLinkerSymbol(string const&) void EVMAssembly::appendLinkerSymbol(string const&)
{ {
solAssert(false, "Linker symbols not yet implemented."); yulAssert(false, "Linker symbols not yet implemented.");
} }
void EVMAssembly::appendJump(int _stackDiffAfter) void EVMAssembly::appendJump(int _stackDiffAfter)
{ {
solAssert(!m_evm15, "Plain JUMP used for EVM 1.5"); yulAssert(!m_evm15, "Plain JUMP used for EVM 1.5");
appendInstruction(dev::eth::Instruction::JUMP); appendInstruction(dev::eth::Instruction::JUMP);
m_stackHeight += _stackDiffAfter; m_stackHeight += _stackDiffAfter;
} }
@ -131,8 +130,8 @@ void EVMAssembly::appendJumpToIf(LabelID _labelId)
void EVMAssembly::appendBeginsub(LabelID _labelId, int _arguments) void EVMAssembly::appendBeginsub(LabelID _labelId, int _arguments)
{ {
solAssert(m_evm15, "BEGINSUB used for EVM 1.0"); yulAssert(m_evm15, "BEGINSUB used for EVM 1.0");
solAssert(_arguments >= 0, ""); yulAssert(_arguments >= 0, "");
setLabelToCurrentPosition(_labelId); setLabelToCurrentPosition(_labelId);
m_bytecode.push_back(uint8_t(dev::eth::Instruction::BEGINSUB)); m_bytecode.push_back(uint8_t(dev::eth::Instruction::BEGINSUB));
m_stackHeight += _arguments; m_stackHeight += _arguments;
@ -140,8 +139,8 @@ void EVMAssembly::appendBeginsub(LabelID _labelId, int _arguments)
void EVMAssembly::appendJumpsub(LabelID _labelId, int _arguments, int _returns) void EVMAssembly::appendJumpsub(LabelID _labelId, int _arguments, int _returns)
{ {
solAssert(m_evm15, "JUMPSUB used for EVM 1.0"); yulAssert(m_evm15, "JUMPSUB used for EVM 1.0");
solAssert(_arguments >= 0 && _returns >= 0, ""); yulAssert(_arguments >= 0 && _returns >= 0, "");
m_bytecode.push_back(uint8_t(dev::eth::Instruction::JUMPSUB)); m_bytecode.push_back(uint8_t(dev::eth::Instruction::JUMPSUB));
appendLabelReferenceInternal(_labelId); appendLabelReferenceInternal(_labelId);
m_stackHeight += _returns - _arguments; m_stackHeight += _returns - _arguments;
@ -149,8 +148,8 @@ void EVMAssembly::appendJumpsub(LabelID _labelId, int _arguments, int _returns)
void EVMAssembly::appendReturnsub(int _returns, int _stackDiffAfter) void EVMAssembly::appendReturnsub(int _returns, int _stackDiffAfter)
{ {
solAssert(m_evm15, "RETURNSUB used for EVM 1.0"); yulAssert(m_evm15, "RETURNSUB used for EVM 1.0");
solAssert(_returns >= 0, ""); yulAssert(_returns >= 0, "");
m_bytecode.push_back(uint8_t(dev::eth::Instruction::RETURNSUB)); m_bytecode.push_back(uint8_t(dev::eth::Instruction::RETURNSUB));
m_stackHeight += _stackDiffAfter - _returns; m_stackHeight += _stackDiffAfter - _returns;
} }
@ -164,9 +163,9 @@ eth::LinkerObject EVMAssembly::finalize()
for (auto const& ref: m_labelReferences) for (auto const& ref: m_labelReferences)
{ {
size_t referencePos = ref.first; size_t referencePos = ref.first;
solAssert(m_labelPositions.count(ref.second), ""); yulAssert(m_labelPositions.count(ref.second), "");
size_t labelPos = m_labelPositions.at(ref.second); size_t labelPos = m_labelPositions.at(ref.second);
solAssert(labelPos != size_t(-1), "Undefined but allocated label used."); yulAssert(labelPos != size_t(-1), "Undefined but allocated label used.");
updateReference(referencePos, labelReferenceSize, u256(labelPos)); updateReference(referencePos, labelReferenceSize, u256(labelPos));
} }
@ -177,8 +176,8 @@ eth::LinkerObject EVMAssembly::finalize()
void EVMAssembly::setLabelToCurrentPosition(LabelID _labelId) void EVMAssembly::setLabelToCurrentPosition(LabelID _labelId)
{ {
solAssert(m_labelPositions.count(_labelId), "Label not found."); yulAssert(m_labelPositions.count(_labelId), "Label not found.");
solAssert(m_labelPositions[_labelId] == size_t(-1), "Label already set."); yulAssert(m_labelPositions[_labelId] == size_t(-1), "Label already set.");
m_labelPositions[_labelId] = m_bytecode.size(); m_labelPositions[_labelId] = m_bytecode.size();
} }
@ -197,29 +196,29 @@ void EVMAssembly::appendAssemblySize()
pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EVMAssembly::createSubAssembly() pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EVMAssembly::createSubAssembly()
{ {
solAssert(false, "Sub assemblies not implemented."); yulAssert(false, "Sub assemblies not implemented.");
return {}; return {};
} }
void EVMAssembly::appendDataOffset(AbstractAssembly::SubID) void EVMAssembly::appendDataOffset(AbstractAssembly::SubID)
{ {
solAssert(false, "Data not implemented."); yulAssert(false, "Data not implemented.");
} }
void EVMAssembly::appendDataSize(AbstractAssembly::SubID) void EVMAssembly::appendDataSize(AbstractAssembly::SubID)
{ {
solAssert(false, "Data not implemented."); yulAssert(false, "Data not implemented.");
} }
AbstractAssembly::SubID EVMAssembly::appendData(bytes const&) AbstractAssembly::SubID EVMAssembly::appendData(bytes const&)
{ {
solAssert(false, "Data not implemented."); yulAssert(false, "Data not implemented.");
} }
void EVMAssembly::updateReference(size_t pos, size_t size, u256 value) void EVMAssembly::updateReference(size_t pos, size_t size, u256 value)
{ {
solAssert(m_bytecode.size() >= size && pos <= m_bytecode.size() - size, ""); yulAssert(m_bytecode.size() >= size && pos <= m_bytecode.size() - size, "");
solAssert(value < (u256(1) << (8 * size)), ""); yulAssert(value < (u256(1) << (8 * size)), "");
for (size_t i = 0; i < size; i++) for (size_t i = 0; i < size; i++)
m_bytecode[pos + i] = uint8_t((value >> (8 * (size - i - 1))) & 0xff); m_bytecode[pos + i] = uint8_t((value >> (8 * (size - i - 1))) & 0xff);
} }

80
libyul/backends/evm/EVMCodeTransform.cpp
View File

@ -44,9 +44,9 @@ void VariableReferenceCounter::operator()(FunctionDefinition const& _function)
{ {
Scope* originalScope = m_scope; Scope* originalScope = m_scope;
solAssert(m_info.virtualBlocks.at(&_function), ""); yulAssert(m_info.virtualBlocks.at(&_function), "");
m_scope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get(); m_scope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
solAssert(m_scope, "Variable scope does not exist."); yulAssert(m_scope, "Variable scope does not exist.");
for (auto const& v: _function.returnVariables) for (auto const& v: _function.returnVariables)
increaseRefIfFound(v.name); increaseRefIfFound(v.name);
@ -131,7 +131,7 @@ void CodeTransform::decreaseReference(YulString, Scope::Variable const& _var)
return; return;
unsigned& ref = m_context->variableReferences.at(&_var); unsigned& ref = m_context->variableReferences.at(&_var);
solAssert(ref >= 1, ""); yulAssert(ref >= 1, "");
--ref; --ref;
if (ref == 0) if (ref == 0)
m_variablesScheduledForDeletion.insert(&_var); m_variablesScheduledForDeletion.insert(&_var);
@ -157,7 +157,7 @@ void CodeTransform::freeUnusedVariables()
while (m_unusedStackSlots.count(m_assembly.stackHeight() - 1)) while (m_unusedStackSlots.count(m_assembly.stackHeight() - 1))
{ {
solAssert(m_unusedStackSlots.erase(m_assembly.stackHeight() - 1), ""); yulAssert(m_unusedStackSlots.erase(m_assembly.stackHeight() - 1), "");
m_assembly.appendInstruction(dev::eth::Instruction::POP); m_assembly.appendInstruction(dev::eth::Instruction::POP);
--m_stackAdjustment; --m_stackAdjustment;
} }
@ -165,8 +165,8 @@ void CodeTransform::freeUnusedVariables()
void CodeTransform::deleteVariable(Scope::Variable const& _var) void CodeTransform::deleteVariable(Scope::Variable const& _var)
{ {
solAssert(m_allowStackOpt, ""); yulAssert(m_allowStackOpt, "");
solAssert(m_context->variableStackHeights.count(&_var) > 0, ""); yulAssert(m_context->variableStackHeights.count(&_var) > 0, "");
m_unusedStackSlots.insert(m_context->variableStackHeights[&_var]); m_unusedStackSlots.insert(m_context->variableStackHeights[&_var]);
m_context->variableStackHeights.erase(&_var); m_context->variableStackHeights.erase(&_var);
m_context->variableReferences.erase(&_var); m_context->variableReferences.erase(&_var);
@ -175,7 +175,7 @@ void CodeTransform::deleteVariable(Scope::Variable const& _var)
void CodeTransform::operator()(VariableDeclaration const& _varDecl) void CodeTransform::operator()(VariableDeclaration const& _varDecl)
{ {
solAssert(m_scope, ""); yulAssert(m_scope, "");
int const numVariables = _varDecl.variables.size(); int const numVariables = _varDecl.variables.size();
int height = m_assembly.stackHeight(); int height = m_assembly.stackHeight();
@ -261,7 +261,7 @@ void CodeTransform::operator()(ExpressionStatement const& _statement)
void CodeTransform::operator()(FunctionCall const& _call) void CodeTransform::operator()(FunctionCall const& _call)
{ {
solAssert(m_scope, ""); yulAssert(m_scope, "");
if (BuiltinFunctionForEVM const* builtin = m_dialect.builtin(_call.functionName.name)) if (BuiltinFunctionForEVM const* builtin = m_dialect.builtin(_call.functionName.name))
{ {
@ -283,13 +283,13 @@ void CodeTransform::operator()(FunctionCall const& _call)
} }
Scope::Function* function = nullptr; Scope::Function* function = nullptr;
solAssert(m_scope->lookup(_call.functionName.name, GenericVisitor{ yulAssert(m_scope->lookup(_call.functionName.name, GenericVisitor{
[=](Scope::Variable&) { solAssert(false, "Expected function name."); }, [=](Scope::Variable&) { yulAssert(false, "Expected function name."); },
[=](Scope::Label&) { solAssert(false, "Expected function name."); }, [=](Scope::Label&) { yulAssert(false, "Expected function name."); },
[&](Scope::Function& _function) { function = &_function; } [&](Scope::Function& _function) { function = &_function; }
}), "Function name not found."); }), "Function name not found.");
solAssert(function, ""); yulAssert(function, "");
solAssert(function->arguments.size() == _call.arguments.size(), ""); yulAssert(function->arguments.size() == _call.arguments.size(), "");
for (auto const& arg: _call.arguments | boost::adaptors::reversed) for (auto const& arg: _call.arguments | boost::adaptors::reversed)
visitExpression(arg); visitExpression(arg);
m_assembly.setSourceLocation(_call.location); m_assembly.setSourceLocation(_call.location);
@ -309,7 +309,7 @@ void CodeTransform::operator()(Identifier const& _identifier)
{ {
m_assembly.setSourceLocation(_identifier.location); m_assembly.setSourceLocation(_identifier.location);
// First search internals, then externals. // First search internals, then externals.
solAssert(m_scope, ""); yulAssert(m_scope, "");
if (m_scope->lookup(_identifier.name, GenericVisitor{ if (m_scope->lookup(_identifier.name, GenericVisitor{
[=](Scope::Variable& _var) [=](Scope::Variable& _var)
{ {
@ -328,13 +328,13 @@ void CodeTransform::operator()(Identifier const& _identifier)
}, },
[=](Scope::Function&) [=](Scope::Function&)
{ {
solAssert(false, "Function not removed during desugaring."); yulAssert(false, "Function not removed during desugaring.");
} }
})) }))
{ {
return; return;
} }
solAssert( yulAssert(
m_identifierAccess.generateCode, m_identifierAccess.generateCode,
"Identifier not found and no external access available." "Identifier not found and no external access available."
); );
@ -352,9 +352,9 @@ void CodeTransform::operator()(Literal const& _literal)
void CodeTransform::operator()(yul::Instruction const& _instruction) void CodeTransform::operator()(yul::Instruction const& _instruction)
{ {
solAssert(!m_allowStackOpt, ""); yulAssert(!m_allowStackOpt, "");
solAssert(!m_evm15 || _instruction.instruction != dev::eth::Instruction::JUMP, "Bare JUMP instruction used for EVM1.5"); yulAssert(!m_evm15 || _instruction.instruction != dev::eth::Instruction::JUMP, "Bare JUMP instruction used for EVM1.5");
solAssert(!m_evm15 || _instruction.instruction != dev::eth::Instruction::JUMPI, "Bare JUMPI instruction used for EVM1.5"); yulAssert(!m_evm15 || _instruction.instruction != dev::eth::Instruction::JUMPI, "Bare JUMPI instruction used for EVM1.5");
m_assembly.setSourceLocation(_instruction.location); m_assembly.setSourceLocation(_instruction.location);
m_assembly.appendInstruction(_instruction.instruction); m_assembly.appendInstruction(_instruction.instruction);
checkStackHeight(&_instruction); checkStackHeight(&_instruction);
@ -389,7 +389,7 @@ void CodeTransform::operator()(Switch const& _switch)
m_assembly.setSourceLocation(c.location); m_assembly.setSourceLocation(c.location);
AbstractAssembly::LabelID bodyLabel = m_assembly.newLabelId(); AbstractAssembly::LabelID bodyLabel = m_assembly.newLabelId();
caseBodies[&c] = bodyLabel; caseBodies[&c] = bodyLabel;
solAssert(m_assembly.stackHeight() == expressionHeight + 1, ""); yulAssert(m_assembly.stackHeight() == expressionHeight + 1, "");
m_assembly.appendInstruction(dev::eth::dupInstruction(2)); m_assembly.appendInstruction(dev::eth::dupInstruction(2));
m_assembly.appendInstruction(dev::eth::Instruction::EQ); m_assembly.appendInstruction(dev::eth::Instruction::EQ);
m_assembly.appendJumpToIf(bodyLabel); m_assembly.appendJumpToIf(bodyLabel);
@ -423,15 +423,15 @@ void CodeTransform::operator()(Switch const& _switch)
void CodeTransform::operator()(FunctionDefinition const& _function) void CodeTransform::operator()(FunctionDefinition const& _function)
{ {
solAssert(m_scope, ""); yulAssert(m_scope, "");
solAssert(m_scope->identifiers.count(_function.name), ""); yulAssert(m_scope->identifiers.count(_function.name), "");
Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name)); Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
int const localStackAdjustment = m_evm15 ? 0 : 1; int const localStackAdjustment = m_evm15 ? 0 : 1;
int height = localStackAdjustment; int height = localStackAdjustment;
solAssert(m_info.scopes.at(&_function.body), ""); yulAssert(m_info.scopes.at(&_function.body), "");
Scope* varScope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get(); Scope* varScope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
solAssert(varScope, ""); yulAssert(varScope, "");
for (auto const& v: _function.parameters | boost::adaptors::reversed) for (auto const& v: _function.parameters | boost::adaptors::reversed)
{ {
auto& var = std::get<Scope::Variable>(varScope->identifiers.at(v.name)); auto& var = std::get<Scope::Variable>(varScope->identifiers.at(v.name));
@ -535,7 +535,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
swap(stackLayout[stackLayout.back()], stackLayout.back()); swap(stackLayout[stackLayout.back()], stackLayout.back());
} }
for (int i = 0; size_t(i) < stackLayout.size(); ++i) for (int i = 0; size_t(i) < stackLayout.size(); ++i)
solAssert(i == stackLayout[i], "Error reshuffling stack."); yulAssert(i == stackLayout[i], "Error reshuffling stack.");
} }
} }
if (m_evm15) if (m_evm15)
@ -647,15 +647,15 @@ AbstractAssembly::LabelID CodeTransform::labelFromIdentifier(Identifier const& _
{ {
AbstractAssembly::LabelID label = AbstractAssembly::LabelID(-1); AbstractAssembly::LabelID label = AbstractAssembly::LabelID(-1);
if (!m_scope->lookup(_identifier.name, GenericVisitor{ if (!m_scope->lookup(_identifier.name, GenericVisitor{
[=](Scope::Variable&) { solAssert(false, "Expected label"); }, [=](Scope::Variable&) { yulAssert(false, "Expected label"); },
[&](Scope::Label& _label) [&](Scope::Label& _label)
{ {
label = labelID(_label); label = labelID(_label);
}, },
[=](Scope::Function&) { solAssert(false, "Expected label"); } [=](Scope::Function&) { yulAssert(false, "Expected label"); }
})) }))
{ {
solAssert(false, "Identifier not found."); yulAssert(false, "Identifier not found.");
} }
return label; return label;
} }
@ -723,15 +723,15 @@ void CodeTransform::finalizeBlock(Block const& _block, int blockStartStackHeight
freeUnusedVariables(); freeUnusedVariables();
// pop variables // pop variables
solAssert(m_info.scopes.at(&_block).get() == m_scope, ""); yulAssert(m_info.scopes.at(&_block).get() == m_scope, "");
for (auto const& id: m_scope->identifiers) for (auto const& id: m_scope->identifiers)
if (holds_alternative<Scope::Variable>(id.second)) if (holds_alternative<Scope::Variable>(id.second))
{ {
Scope::Variable const& var = std::get<Scope::Variable>(id.second); Scope::Variable const& var = std::get<Scope::Variable>(id.second);
if (m_allowStackOpt) if (m_allowStackOpt)
{ {
solAssert(!m_context->variableStackHeights.count(&var), ""); yulAssert(!m_context->variableStackHeights.count(&var), "");
solAssert(!m_context->variableReferences.count(&var), ""); yulAssert(!m_context->variableReferences.count(&var), "");
m_stackAdjustment++; m_stackAdjustment++;
} }
else else
@ -739,20 +739,20 @@ void CodeTransform::finalizeBlock(Block const& _block, int blockStartStackHeight
} }
int deposit = m_assembly.stackHeight() - blockStartStackHeight; int deposit = m_assembly.stackHeight() - blockStartStackHeight;
solAssert(deposit == 0, "Invalid stack height at end of block: " + to_string(deposit)); yulAssert(deposit == 0, "Invalid stack height at end of block: " + to_string(deposit));
checkStackHeight(&_block); checkStackHeight(&_block);
} }
void CodeTransform::generateMultiAssignment(vector<Identifier> const& _variableNames) void CodeTransform::generateMultiAssignment(vector<Identifier> const& _variableNames)
{ {
solAssert(m_scope, ""); yulAssert(m_scope, "");
for (auto const& variableName: _variableNames | boost::adaptors::reversed) for (auto const& variableName: _variableNames | boost::adaptors::reversed)
generateAssignment(variableName); generateAssignment(variableName);
} }
void CodeTransform::generateAssignment(Identifier const& _variableName) void CodeTransform::generateAssignment(Identifier const& _variableName)
{ {
solAssert(m_scope, ""); yulAssert(m_scope, "");
if (auto var = m_scope->lookup(_variableName.name)) if (auto var = m_scope->lookup(_variableName.name))
{ {
Scope::Variable const& _var = std::get<Scope::Variable>(*var); Scope::Variable const& _var = std::get<Scope::Variable>(*var);
@ -763,7 +763,7 @@ void CodeTransform::generateAssignment(Identifier const& _variableName)
} }
else else
{ {
solAssert( yulAssert(
m_identifierAccess.generateCode, m_identifierAccess.generateCode,
"Identifier not found and no external access available." "Identifier not found and no external access available."
); );
@ -773,9 +773,9 @@ void CodeTransform::generateAssignment(Identifier const& _variableName)
int CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString _varName, bool _forSwap) int CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString _varName, bool _forSwap)
{ {
solAssert(m_context->variableStackHeights.count(&_var), ""); yulAssert(m_context->variableStackHeights.count(&_var), "");
int heightDiff = m_assembly.stackHeight() - m_context->variableStackHeights[&_var]; int heightDiff = m_assembly.stackHeight() - m_context->variableStackHeights[&_var];
solAssert(heightDiff > (_forSwap ? 1 : 0), "Negative stack difference for variable."); yulAssert(heightDiff > (_forSwap ? 1 : 0), "Negative stack difference for variable.");
int limit = _forSwap ? 17 : 16; int limit = _forSwap ? 17 : 16;
if (heightDiff > limit) if (heightDiff > limit)
{ {
@ -794,15 +794,15 @@ int CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString _va
void CodeTransform::expectDeposit(int _deposit, int _oldHeight) const void CodeTransform::expectDeposit(int _deposit, int _oldHeight) const
{ {
solAssert(m_assembly.stackHeight() == _oldHeight + _deposit, "Invalid stack deposit."); yulAssert(m_assembly.stackHeight() == _oldHeight + _deposit, "Invalid stack deposit.");
} }
void CodeTransform::checkStackHeight(void const* _astElement) const void CodeTransform::checkStackHeight(void const* _astElement) const
{ {
solAssert(m_info.stackHeightInfo.count(_astElement), "Stack height for AST element not found."); yulAssert(m_info.stackHeightInfo.count(_astElement), "Stack height for AST element not found.");
int stackHeightInAnalysis = m_info.stackHeightInfo.at(_astElement); int stackHeightInAnalysis = m_info.stackHeightInfo.at(_astElement);
int stackHeightInCodegen = m_assembly.stackHeight() - m_stackAdjustment; int stackHeightInCodegen = m_assembly.stackHeight() - m_stackAdjustment;
solAssert( yulAssert(
stackHeightInAnalysis == stackHeightInCodegen, stackHeightInAnalysis == stackHeightInCodegen,
"Stack height mismatch between analysis and code generation phase: Analysis: " + "Stack height mismatch between analysis and code generation phase: Analysis: " +
to_string(stackHeightInAnalysis) + to_string(stackHeightInAnalysis) +

23
libyul/backends/evm/NoOutputAssembly.cpp
View File

@ -19,11 +19,10 @@
*/ */
#include <libyul/backends/evm/NoOutputAssembly.h> #include <libyul/backends/evm/NoOutputAssembly.h>
#include <libyul/Exceptions.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <liblangutil/Exceptions.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace langutil; using namespace langutil;
@ -47,7 +46,7 @@ void NoOutputAssembly::appendLabel(LabelID)
void NoOutputAssembly::appendLabelReference(LabelID) void NoOutputAssembly::appendLabelReference(LabelID)
{ {
solAssert(!m_evm15, "Cannot use plain label references in EMV1.5 mode."); yulAssert(!m_evm15, "Cannot use plain label references in EMV1.5 mode.");
appendInstruction(dev::eth::pushInstruction(1)); appendInstruction(dev::eth::pushInstruction(1));
} }
@ -63,12 +62,12 @@ AbstractAssembly::LabelID NoOutputAssembly::namedLabel(string const&)
void NoOutputAssembly::appendLinkerSymbol(string const&) void NoOutputAssembly::appendLinkerSymbol(string const&)
{ {
solAssert(false, "Linker symbols not yet implemented."); yulAssert(false, "Linker symbols not yet implemented.");
} }
void NoOutputAssembly::appendJump(int _stackDiffAfter) void NoOutputAssembly::appendJump(int _stackDiffAfter)
{ {
solAssert(!m_evm15, "Plain JUMP used for EVM 1.5"); yulAssert(!m_evm15, "Plain JUMP used for EVM 1.5");
appendInstruction(dev::eth::Instruction::JUMP); appendInstruction(dev::eth::Instruction::JUMP);
m_stackHeight += _stackDiffAfter; m_stackHeight += _stackDiffAfter;
} }
@ -97,22 +96,22 @@ void NoOutputAssembly::appendJumpToIf(LabelID _labelId)
void NoOutputAssembly::appendBeginsub(LabelID, int _arguments) void NoOutputAssembly::appendBeginsub(LabelID, int _arguments)
{ {
solAssert(m_evm15, "BEGINSUB used for EVM 1.0"); yulAssert(m_evm15, "BEGINSUB used for EVM 1.0");
solAssert(_arguments >= 0, ""); yulAssert(_arguments >= 0, "");
m_stackHeight += _arguments; m_stackHeight += _arguments;
} }
void NoOutputAssembly::appendJumpsub(LabelID, int _arguments, int _returns) void NoOutputAssembly::appendJumpsub(LabelID, int _arguments, int _returns)
{ {
solAssert(m_evm15, "JUMPSUB used for EVM 1.0"); yulAssert(m_evm15, "JUMPSUB used for EVM 1.0");
solAssert(_arguments >= 0 && _returns >= 0, ""); yulAssert(_arguments >= 0 && _returns >= 0, "");
m_stackHeight += _returns - _arguments; m_stackHeight += _returns - _arguments;
} }
void NoOutputAssembly::appendReturnsub(int _returns, int _stackDiffAfter) void NoOutputAssembly::appendReturnsub(int _returns, int _stackDiffAfter)
{ {
solAssert(m_evm15, "RETURNSUB used for EVM 1.0"); yulAssert(m_evm15, "RETURNSUB used for EVM 1.0");
solAssert(_returns >= 0, ""); yulAssert(_returns >= 0, "");
m_stackHeight += _stackDiffAfter - _returns; m_stackHeight += _stackDiffAfter - _returns;
} }
@ -123,7 +122,7 @@ void NoOutputAssembly::appendAssemblySize()
pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly() pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly()
{ {
solAssert(false, "Sub assemblies not implemented."); yulAssert(false, "Sub assemblies not implemented.");
return {}; return {};
} }

17
scripts/deps-ppa/static_z3.sh
View File

@ -25,7 +25,9 @@ set -ev
keyid=70D110489D66E2F6 keyid=70D110489D66E2F6
email=builds@ethereum.org email=builds@ethereum.org
packagename=libz3-static-dev packagename=libz3-static-dev
version=4.8.6 # On the next version the git cherry-pick below should be removed and the patch suffix removed from the version string.
version=4.8.7
version_patchsuffix=-1
DISTRIBUTIONS="bionic disco eoan" DISTRIBUTIONS="bionic disco eoan"
@ -40,11 +42,14 @@ pparepo=cpp-build-deps
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
# Fetch source # Fetch source
git clone --depth 1 --branch z3-${version} https://github.com/Z3Prover/z3.git git clone --branch z3-${version} https://github.com/Z3Prover/z3.git
cd z3 cd z3
debversion="$version" # Patch build failure.
git cherry-pick e212159f4e
CMAKE_OPTIONS="-DBUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release" debversion="${version}${version_patchsuffix}"
CMAKE_OPTIONS="-DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
# gzip will create different tars all the time and we are not allowed # gzip will create different tars all the time and we are not allowed
# to upload the same file twice with different contents, so we only # to upload the same file twice with different contents, so we only
@ -176,7 +181,7 @@ This program is free software: you can redistribute it and/or modify
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
EOF EOF
cat <<EOF > debian/changelog cat <<EOF > debian/changelog
libz3-static-dev (0.0.1-0ubuntu1) saucy; urgency=low libz3-static-dev (0.0.1-2ubuntu0) saucy; urgency=low
* Initial release. * Initial release.
@ -186,7 +191,7 @@ mkdir debian/source
echo "3.0 (quilt)" > debian/source/format echo "3.0 (quilt)" > debian/source/format
chmod +x debian/rules chmod +x debian/rules
versionsuffix=0ubuntu1~${distribution} versionsuffix=2ubuntu0~${distribution}
EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}" EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}"
# build source package # build source package

4
scripts/install_static_z3.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
git clone --depth 1 --branch z3-4.8.1 https://github.com/Z3Prover/z3.git git clone --depth 1 --branch z3-4.8.7 https://github.com/Z3Prover/z3.git
cd z3 cd z3
mkdir build mkdir build
cd build cd build
LDFLAGS="-static" cmake -DBUILD_LIBZ3_SHARED=OFF .. LDFLAGS="-static" cmake -DZ3_BUILD_LIBZ3_SHARED=OFF ..
make -j 4 make -j 4
make install make install

41
test/libdevcore/JSON.cpp
View File

@ -69,47 +69,6 @@ BOOST_AUTO_TEST_CASE(json_compact_print)
BOOST_CHECK("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}" == jsonCompactPrint(json)); BOOST_CHECK("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}" == jsonCompactPrint(json));
} }
BOOST_AUTO_TEST_CASE(parse_json_not_strict)
{
Json::Value json;
std::string errors;
// just parse a valid json input
BOOST_CHECK(jsonParse("{\"1\":1,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":2}}", json, &errors));
BOOST_CHECK(json["1"] == 1);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 2);
// trailing garbage is allowed here
BOOST_CHECK(jsonParse("{\"1\":2,\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":3}}}}}}}}}}", json, &errors));
BOOST_CHECK(json["1"] == 2);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 3);
// comments are allowed
BOOST_CHECK(jsonParse(
"{\"1\":3, // awesome comment\n\"2\":\"2\",\"3\":{\"3.1\":\"3.1\",\"3.2\":4}}", json, &errors
));
BOOST_CHECK(json["1"] == 3);
BOOST_CHECK(json["2"] == "2");
BOOST_CHECK(json["3"]["3.1"] == "3.1");
BOOST_CHECK(json["3"]["3.2"] == 4);
// root element other than object or array is allowed
BOOST_CHECK(jsonParse("[]", json, &errors));
BOOST_CHECK(jsonParse("{}", json, &errors));
BOOST_CHECK(jsonParse("1", json, &errors));
BOOST_CHECK(json == 1);
BOOST_CHECK(jsonParse("\"hello\"", json, &errors));
BOOST_CHECK(json == "hello");
// non-UTF-8 escapes allowed
BOOST_CHECK(jsonParse("[ \"\x80\xec\x80\" ]", json, &errors));
BOOST_CHECK(json[0] == "\x80\xec\x80");
}
BOOST_AUTO_TEST_CASE(parse_json_strict) BOOST_AUTO_TEST_CASE(parse_json_strict)
{ {
Json::Value json; Json::Value json;

2
test/libsolidity/Metadata.cpp
View File

@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed"); BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
string metadata_str = compilerStack.metadata("test"); string metadata_str = compilerStack.metadata("test");
Json::Value metadata; Json::Value metadata;
jsonParse(metadata_str, metadata); jsonParseStrict(metadata_str, metadata);
BOOST_CHECK(dev::test::isValidMetadata(metadata_str)); BOOST_CHECK(dev::test::isValidMetadata(metadata_str));
BOOST_CHECK(metadata.isMember("settings")); BOOST_CHECK(metadata.isMember("settings"));
BOOST_CHECK(metadata["settings"].isMember("metadata")); BOOST_CHECK(metadata["settings"].isMember("metadata"));

5
test/libsolidity/SMTCheckerJSONTest.cpp
View File

@ -18,6 +18,7 @@
#include <test/libsolidity/SMTCheckerJSONTest.h> #include <test/libsolidity/SMTCheckerJSONTest.h>
#include <test/Options.h> #include <test/Options.h>
#include <libsolidity/interface/StandardCompiler.h> #include <libsolidity/interface/StandardCompiler.h>
#include <libdevcore/CommonIO.h>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
@ -43,7 +44,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename, langutil::EVMVersion _ev
string jsonFilename = _filename.substr(0, _filename.size() - 4) + ".json"; string jsonFilename = _filename.substr(0, _filename.size() - 4) + ".json";
if ( if (
!jsonParseFile(jsonFilename, m_smtResponses) || !jsonParseStrict(readFileAsString(jsonFilename), m_smtResponses) ||
!m_smtResponses.isObject() !m_smtResponses.isObject()
) )
BOOST_THROW_EXCEPTION(runtime_error("Invalid JSON file.")); BOOST_THROW_EXCEPTION(runtime_error("Invalid JSON file."));
@ -158,7 +159,7 @@ Json::Value SMTCheckerTest::buildJson(string const& _extra)
sources += "}"; sources += "}";
string input = "{" + language + ", " + sources + "}"; string input = "{" + language + ", " + sources + "}";
Json::Value source; Json::Value source;
if (!jsonParse(input, source)) if (!jsonParseStrict(input, source))
BOOST_THROW_EXCEPTION(runtime_error("Could not build JSON from string: " + input)); BOOST_THROW_EXCEPTION(runtime_error("Could not build JSON from string: " + input));
return source; return source;
} }

4
test/libsolidity/StandardCompiler.cpp
View File

@ -1199,7 +1199,9 @@ BOOST_AUTO_TEST_CASE(use_stack_optimization)
result = compiler.compile(parsedInput); result = compiler.compile(parsedInput);
BOOST_REQUIRE(result["errors"].isArray()); BOOST_REQUIRE(result["errors"].isArray());
BOOST_CHECK(result["errors"][0]["severity"] == "error"); BOOST_CHECK(result["errors"][0]["severity"] == "error");
BOOST_CHECK(result["errors"][0]["type"] == "InternalCompilerError"); BOOST_REQUIRE(result["errors"][0]["message"].isString());
BOOST_CHECK(result["errors"][0]["message"].asString().find("Stack too deep when compiling inline assembly") != std::string::npos);
BOOST_CHECK(result["errors"][0]["type"] == "YulException");
} }
BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard) BOOST_AUTO_TEST_CASE(standard_output_selection_wildcard)

1
test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2.sol
View File

@ -12,6 +12,5 @@ contract C {
// Warning: (206-209): Assertion checker does not yet implement type abi // Warning: (206-209): Assertion checker does not yet implement type abi
// Warning: (225-226): Assertion checker does not yet implement type type(struct C.S storage pointer) // Warning: (225-226): Assertion checker does not yet implement type type(struct C.S storage pointer)
// Warning: (235-241): Assertion checker does not yet implement type type(uint256[] memory) // Warning: (235-241): Assertion checker does not yet implement type type(uint256[] memory)
// Warning: (235-241): Assertion checker does not yet implement this expression.
// Warning: (235-244): Assertion checker does not yet implement type type(uint256[] memory[2] memory) // Warning: (235-244): Assertion checker does not yet implement type type(uint256[] memory[2] memory)
// Warning: (206-246): Assertion checker does not yet implement this type of function call. // Warning: (206-246): Assertion checker does not yet implement this type of function call.

24
test/libsolidity/smtCheckerTests/types/no_effect_statements.sol Normal file
View File

@ -0,0 +1,24 @@
pragma experimental SMTChecker;
contract test {
struct s { uint a; uint b;}
function f() pure public returns (byte) {
s;
s(1,2);
s[7];
uint;
uint[7];
}
}
// ----
// Warning: (125-126): Statement has no effect.
// Warning: (130-136): Statement has no effect.
// Warning: (140-144): Statement has no effect.
// Warning: (148-152): Statement has no effect.
// Warning: (156-163): Statement has no effect.
// Warning: (125-126): Assertion checker does not yet implement type type(struct test.s storage pointer)
// Warning: (130-131): Assertion checker does not yet implement type type(struct test.s storage pointer)
// Warning: (130-136): Assertion checker does not yet implement type struct test.s memory
// Warning: (130-136): Assertion checker does not yet implement this expression.
// Warning: (140-141): Assertion checker does not yet implement type type(struct test.s storage pointer)
// Warning: (140-144): Assertion checker does not yet implement type type(struct test.s memory[7] memory)
// Warning: (156-163): Assertion checker does not yet implement type type(uint256[7] memory)

1
test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
View File

@ -7,5 +7,4 @@ function f() public pure { int[][]; }
// ---- // ----
// Warning: (73-80): Statement has no effect. // Warning: (73-80): Statement has no effect.
// Warning: (73-78): Assertion checker does not yet implement type type(int256[] memory) // Warning: (73-78): Assertion checker does not yet implement type type(int256[] memory)
// Warning: (73-78): Assertion checker does not yet implement this expression.
// Warning: (73-80): Assertion checker does not yet implement type type(int256[] memory[] memory) // Warning: (73-80): Assertion checker does not yet implement type type(int256[] memory[] memory)

1
test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
View File

@ -7,6 +7,5 @@ function f() public pure { int[][][]; }
// ---- // ----
// Warning: (73-82): Statement has no effect. // Warning: (73-82): Statement has no effect.
// Warning: (73-78): Assertion checker does not yet implement type type(int256[] memory) // Warning: (73-78): Assertion checker does not yet implement type type(int256[] memory)
// Warning: (73-78): Assertion checker does not yet implement this expression.
// Warning: (73-80): Assertion checker does not yet implement type type(int256[] memory[] memory) // Warning: (73-80): Assertion checker does not yet implement type type(int256[] memory[] memory)
// Warning: (73-82): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory) // Warning: (73-82): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)

1
test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
View File

@ -7,6 +7,5 @@ function f() public pure { (int[][]); }
// ---- // ----
// Warning: (73-82): Statement has no effect. // Warning: (73-82): Statement has no effect.
// Warning: (74-79): Assertion checker does not yet implement type type(int256[] memory) // Warning: (74-79): Assertion checker does not yet implement type type(int256[] memory)
// Warning: (74-79): Assertion checker does not yet implement this expression.
// Warning: (74-81): Assertion checker does not yet implement type type(int256[] memory[] memory) // Warning: (74-81): Assertion checker does not yet implement type type(int256[] memory[] memory)
// Warning: (73-82): Assertion checker does not yet implement type type(int256[] memory[] memory) // Warning: (73-82): Assertion checker does not yet implement type type(int256[] memory[] memory)

1
test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
View File

@ -7,7 +7,6 @@ function f() public pure { (int[][][]); }
// ---- // ----
// Warning: (73-84): Statement has no effect. // Warning: (73-84): Statement has no effect.
// Warning: (74-79): Assertion checker does not yet implement type type(int256[] memory) // Warning: (74-79): Assertion checker does not yet implement type type(int256[] memory)
// Warning: (74-79): Assertion checker does not yet implement this expression.
// Warning: (74-81): Assertion checker does not yet implement type type(int256[] memory[] memory) // Warning: (74-81): Assertion checker does not yet implement type type(int256[] memory[] memory)
// Warning: (74-83): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory) // Warning: (74-83): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
// Warning: (73-84): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory) // Warning: (73-84): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)