From a890c82f9dee11a41fcb4a987d6da8b764284b5e Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 6 Mar 2022 23:14:53 -0500 Subject: [PATCH 01/58] Remove use of `using namespace` in header file --- libsolidity/ast/ASTAnnotations.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h index 53931e426..2b07eebbd 100644 --- a/libsolidity/ast/ASTAnnotations.h +++ b/libsolidity/ast/ASTAnnotations.h @@ -47,7 +47,6 @@ namespace solidity::frontend class Type; class ArrayType; -using namespace util; struct CallGraph; @@ -91,13 +90,13 @@ struct StructurallyDocumentedAnnotation struct SourceUnitAnnotation: ASTAnnotation { /// The "absolute" (in the compiler sense) path of this source unit. - SetOnce path; + util::SetOnce path; /// The exported symbols (all global symbols). - SetOnce>> exportedSymbols; + util::SetOnce>> exportedSymbols; /// Experimental features. std::set experimentalFeatures; /// Using the new ABI coder. Set to `false` if using ABI coder v1. - SetOnce useABICoderV2; + util::SetOnce useABICoderV2; }; struct ScopableAnnotation @@ -127,7 +126,7 @@ struct DeclarationAnnotation: ASTAnnotation, ScopableAnnotation struct ImportAnnotation: DeclarationAnnotation { /// The absolute path of the source unit to import. - SetOnce absolutePath; + util::SetOnce absolutePath; /// The actual source unit. SourceUnit const* sourceUnit = nullptr; }; @@ -135,7 +134,7 @@ struct ImportAnnotation: DeclarationAnnotation struct TypeDeclarationAnnotation: DeclarationAnnotation { /// The name of this type, prefixed by proper namespaces if globally accessible. - SetOnce canonicalName; + util::SetOnce canonicalName; }; struct StructDeclarationAnnotation: TypeDeclarationAnnotation @@ -162,9 +161,9 @@ struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocu /// These can either be inheritance specifiers or modifier invocations. std::map baseConstructorArguments; /// A graph with edges representing calls between functions that may happen during contract construction. - SetOnce> creationCallGraph; + util::SetOnce> creationCallGraph; /// A graph with edges representing calls between functions that may happen in a deployed contract. - SetOnce> deployedCallGraph; + util::SetOnce> deployedCallGraph; /// List of contracts whose bytecode is referenced by this contract, e.g. through "new". /// The Value represents the ast node that referenced the contract. @@ -252,7 +251,7 @@ struct IdentifierPathAnnotation: ASTAnnotation /// Referenced declaration, set during reference resolution stage. Declaration const* referencedDeclaration = nullptr; /// What kind of lookup needs to be done (static, virtual, super) find the declaration. - SetOnce requiredLookup; + util::SetOnce requiredLookup; }; struct ExpressionAnnotation: ASTAnnotation @@ -260,11 +259,11 @@ struct ExpressionAnnotation: ASTAnnotation /// Inferred type of the expression. Type const* type = nullptr; /// Whether the expression is a constant variable - SetOnce isConstant; + util::SetOnce isConstant; /// Whether the expression is pure, i.e. compile-time constant. - SetOnce isPure; + util::SetOnce isPure; /// Whether it is an LValue (i.e. something that can be assigned to). - SetOnce isLValue; + util::SetOnce isLValue; /// Whether the expression is used in a context where the LValue is actually required. bool willBeWrittenTo = false; /// Whether the expression is an lvalue that is only assigned. @@ -291,7 +290,7 @@ struct IdentifierAnnotation: ExpressionAnnotation /// Referenced declaration, set at latest during overload resolution stage. Declaration const* referencedDeclaration = nullptr; /// What kind of lookup needs to be done (static, virtual, super) find the declaration. - SetOnce requiredLookup; + util::SetOnce requiredLookup; /// List of possible declarations it could refer to (can contain duplicates). std::vector candidateDeclarations; /// List of possible declarations it could refer to. @@ -303,7 +302,7 @@ struct MemberAccessAnnotation: ExpressionAnnotation /// Referenced declaration, set at latest during overload resolution stage. Declaration const* referencedDeclaration = nullptr; /// What kind of lookup needs to be done (static, virtual, super) find the declaration. - SetOnce requiredLookup; + util::SetOnce requiredLookup; }; struct BinaryOperationAnnotation: ExpressionAnnotation From 4d9a0787981ee38c5567afb55aad0b568a7f3c0d Mon Sep 17 00:00:00 2001 From: franzihei Date: Tue, 1 Mar 2022 15:31:10 +0100 Subject: [PATCH 02/58] updates index with language links --- docs/index.rst | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index f69f8692b..7576b3632 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -5,10 +5,8 @@ Solidity is an object-oriented, high-level language for implementing smart contracts. Smart contracts are programs which govern the behaviour of accounts within the Ethereum state. -Solidity is a `curly-bracket language `_. -It is influenced by C++, Python and JavaScript, and is designed to target the Ethereum Virtual Machine (EVM). -You can find more details about which languages Solidity has been inspired by in -the :doc:`language influences ` section. +Solidity is a `curly-bracket language `_ designed to target the Ethereum Virtual Machine (EVM). +It is influenced by C++, Python and JavaScript. You can find more details about which languages Solidity has been inspired by in the :doc:`language influences ` section. Solidity is statically typed, supports inheritance, libraries and complex user-defined types among other features. @@ -90,24 +88,25 @@ our `Gitter channel `_. Translations ------------ -Community volunteers help translate this documentation into several languages. -They have varying degrees of completeness and up-to-dateness. The English +Community contributors help translate this documentation into several languages. +Note that they have varying degrees of completeness and up-to-dateness. The English version stands as a reference. +You can switch between languages by clicking on the flyout menu in the bottom-left corner +and selecting the preferred language. + +* `French `_ +* `Indonesian `_ +* `Persian `_ +* `Japanese `_ +* `Korean `_ +* `Chinese `_ + .. note:: We recently set up a new GitHub organization and translation workflow to help streamline the community efforts. Please refer to the `translation guide `_ - for information on how to contribute to the community translations moving forward. - -* `French `_ (in progress) -* `Italian `_ (in progress) -* `Japanese `_ -* `Korean `_ (in progress) -* `Russian `_ (rather outdated) -* `Simplified Chinese `_ (in progress) -* `Spanish `_ -* `Turkish `_ (partial) + for information on how to start a new language or contribute to the community translations. Contents ======== From 52dfccca98d870566c764204495582a1656b3a10 Mon Sep 17 00:00:00 2001 From: wechman Date: Fri, 4 Mar 2022 10:15:57 +0100 Subject: [PATCH 03/58] Replace all locale-dependent operations with locale-agnostic counterparts --- libevmasm/AssemblyItem.cpp | 4 +- liblangutil/Token.cpp | 11 +++-- libsolidity/ast/Types.cpp | 5 ++- .../codegen/ir/IRGeneratorForStatements.cpp | 2 +- libsolidity/formal/CHC.cpp | 5 ++- libsolutil/CommonData.cpp | 11 ++--- libsolutil/StringUtils.h | 45 +++++++++++++++++++ libyul/backends/evm/EVMDialect.cpp | 20 ++++----- libyul/optimiser/SimplificationRules.cpp | 14 +++--- test/CommonSyntaxTest.cpp | 13 +++--- test/TestCase.cpp | 2 +- test/TestCase.h | 2 +- test/libsolidity/util/BytesUtils.cpp | 3 +- test/libsolidity/util/TestFileParser.cpp | 15 ++++--- test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp | 3 +- test/tools/yulopti.cpp | 3 +- 16 files changed, 106 insertions(+), 52 deletions(-) diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index eeeadb3ef..984058765 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -200,9 +200,7 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const case Operation: { assertThrow(isValidInstruction(instruction()), AssemblyException, "Invalid instruction."); - string name = instructionInfo(instruction()).name; - transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); }); - text = name; + text = util::toLower(instructionInfo(instruction()).name); break; } case Push: diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp index 8bdaff1fd..d7620ef13 100644 --- a/liblangutil/Token.cpp +++ b/liblangutil/Token.cpp @@ -40,10 +40,13 @@ // You should have received a copy of the GNU General Public License // along with solidity. If not, see . -#include #include +#include +#include + #include + using namespace std; namespace solidity::langutil @@ -180,11 +183,11 @@ tuple fromIdentifierOrKeyword(string const& _ return ret; }; - auto positionM = find_if(_literal.begin(), _literal.end(), ::isdigit); + auto positionM = find_if(_literal.begin(), _literal.end(), util::isDigit); if (positionM != _literal.end()) { string baseType(_literal.begin(), positionM); - auto positionX = find_if_not(positionM, _literal.end(), ::isdigit); + auto positionX = find_if_not(positionM, _literal.end(), util::isDigit); int m = parseSize(positionM, positionX); Token keyword = keywordByName(baseType); if (keyword == Token::Bytes) @@ -208,7 +211,7 @@ tuple fromIdentifierOrKeyword(string const& _ positionM < positionX && positionX < _literal.end() && *positionX == 'x' && - all_of(positionX + 1, _literal.end(), ::isdigit) + all_of(positionX + 1, _literal.end(), util::isDigit) ) { int n = parseSize(positionX + 1, _literal.end()); if ( diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index 8a6905307..c84d79785 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -781,8 +782,8 @@ tuple RationalNumberType::parseRational(string const& _value) if (radixPoint != _value.end()) { if ( - !all_of(radixPoint + 1, _value.end(), ::isdigit) || - !all_of(_value.begin(), radixPoint, ::isdigit) + !all_of(radixPoint + 1, _value.end(), util::isDigit) || + !all_of(_value.begin(), radixPoint, util::isDigit) ) return make_tuple(false, rational(0)); diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp index ed49c94b0..01c012e65 100644 --- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp +++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp @@ -203,7 +203,7 @@ private: else solAssert(false); - if (isdigit(value.front())) + if (isDigit(value.front())) return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::YulString{value}, {}}; else return yul::Identifier{_identifier.debugData, yul::YulString{value}}; diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp index 9e31d7fc9..cbadc2c1d 100644 --- a/libsolidity/formal/CHC.cpp +++ b/libsolidity/formal/CHC.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef HAVE_Z3_DLOPEN #include @@ -1998,9 +1999,9 @@ map> CHC::summaryCalls(CHCSolverInterface::CexGraph c // Predicates that do not have a CALLID have a predicate id at the end of , // so the assertion below should still hold. auto beg = _s.data(); - while (beg != _s.data() + _s.size() && !isdigit(*beg)) ++beg; + while (beg != _s.data() + _s.size() && !isDigit(*beg)) ++beg; auto end = beg; - while (end != _s.data() + _s.size() && isdigit(*end)) ++end; + while (end != _s.data() + _s.size() && isDigit(*end)) ++end; solAssert(beg != end, "Expected to find numerical call or predicate id."); diff --git a/libsolutil/CommonData.cpp b/libsolutil/CommonData.cpp index a49f90491..437a090c2 100644 --- a/libsolutil/CommonData.cpp +++ b/libsolutil/CommonData.cpp @@ -20,11 +20,12 @@ * @date 2014 */ +#include #include #include -#include -#include #include +#include +#include #include @@ -154,9 +155,9 @@ string solidity::util::getChecksummedAddress(string const& _addr) char addressCharacter = s[i]; uint8_t nibble = hash[i / 2u] >> (4u * (1u - (i % 2u))) & 0xf; if (nibble >= 8) - ret += static_cast(toupper(addressCharacter)); + ret += toUpper(addressCharacter); else - ret += static_cast(tolower(addressCharacter)); + ret += toLower(addressCharacter); } return ret; } @@ -211,7 +212,7 @@ string solidity::util::escapeAndQuoteString(string const& _input) out += "\\r"; else if (c == '\t') out += "\\t"; - else if (!isprint(c, locale::classic())) + else if (!isPrint(c)) { ostringstream o; o << "\\x" << std::hex << setfill('0') << setw(2) << (unsigned)(unsigned char)(c); diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h index 09aa30be9..7a48c296f 100644 --- a/libsolutil/StringUtils.h +++ b/libsolutil/StringUtils.h @@ -27,7 +27,9 @@ #include #include +#include #include +#include #include #include @@ -197,4 +199,47 @@ inline std::optional toUnsignedInt(std::string const& _value) } } +/// Converts parameter _c to its lowercase equivalent if c is an uppercase letter and has a lowercase equivalent. It uses the classic "C" locale semantics. +/// @param _c value to be converted +/// @return the converted value +inline char toLower(char _c) +{ + return tolower(_c, std::locale::classic()); +} + +/// Converts parameter _c to its uppercase equivalent if c is an lowercase letter and has a uppercase equivalent. It uses the classic "C" locale semantics. +/// @param _c value to be converted +/// @return the converted value +inline char toUpper(char _c) +{ + return toupper(_c, std::locale::classic()); +} + +/// Converts parameter _s to its lowercase equivalent. It uses the classic "C" locale semantics. +/// @param _s value to be converted +/// @return the converted value +inline std::string toLower(std::string _s) +{ + std::transform(_s.begin(), _s.end(), _s.begin(), [](char _c) { + return toLower(_c); + }); + return _s; +} + +/// Checks whether _c is a decimal digit character. It uses the classic "C" locale semantics. +/// @param _c character to be checked +/// @return true if _c is a decimal digit character, false otherwise +inline bool isDigit(char _c) +{ + return isdigit(_c, std::locale::classic()); +} + +// Checks if character is printable using classic "C" locale +/// @param _c character to be checked +/// @return true if _c is a printable character, false otherwise. +inline bool isPrint(char _c) +{ + return isprint(_c, std::locale::classic()); +} + } diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp index 0fefb24d0..35fa5f88e 100644 --- a/libyul/backends/evm/EVMDialect.cpp +++ b/libyul/backends/evm/EVMDialect.cpp @@ -21,17 +21,17 @@ #include -#include +#include +#include +#include +#include #include -#include -#include +#include #include +#include +#include #include #include -#include -#include - -#include #include #include @@ -121,8 +121,7 @@ set createReservedIdentifiers(langutil::EVMVersion _evmVersion) set reserved; for (auto const& instr: evmasm::c_instructions) { - string name = instr.first; - transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); }); + string name = toLower(instr.first); if (!baseFeeException(instr.second)) reserved.emplace(name); } @@ -142,8 +141,7 @@ map createBuiltins(langutil::EVMVersion _evmVe map builtins; for (auto const& instr: evmasm::c_instructions) { - string name = instr.first; - transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); }); + string name = toLower(instr.first); auto const opcode = instr.second; if ( diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp index 55c30d2f2..3e906fcdf 100644 --- a/libyul/optimiser/SimplificationRules.cpp +++ b/libyul/optimiser/SimplificationRules.cpp @@ -21,15 +21,16 @@ #include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include +#include using namespace std; using namespace solidity; @@ -249,8 +250,7 @@ Expression Pattern::toExpression(shared_ptr const& _debugData) for (auto const& arg: m_arguments) arguments.emplace_back(arg.toExpression(_debugData)); - string name = instructionInfo(m_instruction).name; - transform(begin(name), end(name), begin(name), [](auto _c) { return tolower(_c); }); + string name = util::toLower(instructionInfo(m_instruction).name); return FunctionCall{_debugData, Identifier{_debugData, YulString{name}}, diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp index 11f654281..d28ec1675 100644 --- a/test/CommonSyntaxTest.cpp +++ b/test/CommonSyntaxTest.cpp @@ -29,7 +29,6 @@ using namespace std; using namespace solidity; -using namespace solidity::util; using namespace solidity::util::formatting; using namespace solidity::langutil; using namespace solidity::frontend; @@ -43,10 +42,11 @@ namespace int parseUnsignedInteger(string::iterator& _it, string::iterator _end) { - if (_it == _end || !isdigit(*_it)) + auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());}; + if (_it == _end || !isDigit(*_it)) BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected.")); int result = 0; - while (_it != _end && isdigit(*_it)) + while (_it != _end && isDigit(*_it)) { result *= 10; result += *_it - '0'; @@ -195,6 +195,7 @@ string CommonSyntaxTest::errorMessage(Exception const& _e) vector CommonSyntaxTest::parseExpectations(istream& _stream) { + auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());}; vector expectations; string line; while (getline(_stream, line)) @@ -207,14 +208,14 @@ vector CommonSyntaxTest::parseExpectations(istream& _stream) if (it == line.end()) continue; auto typeBegin = it; - while (it != line.end() && isalpha(*it)) + while (it != line.end() && isalpha(*it, locale::classic())) ++it; string errorType(typeBegin, it); skipWhitespace(it, line.end()); optional errorId; - if (it != line.end() && isdigit(*it)) + if (it != line.end() && isDigit(*it)) errorId = ErrorId{static_cast(parseUnsignedInteger(it, line.end()))}; expect(it, line.end(), ':'); @@ -227,7 +228,7 @@ vector CommonSyntaxTest::parseExpectations(istream& _stream) if (it != line.end() && *it == '(') { ++it; - if (it != line.end() && !isdigit(*it)) + if (it != line.end() && !isDigit(*it)) { auto sourceNameStart = it; while (it != line.end() && *it != ':') diff --git a/test/TestCase.cpp b/test/TestCase.cpp index 93b209aba..32de68296 100644 --- a/test/TestCase.cpp +++ b/test/TestCase.cpp @@ -118,7 +118,7 @@ EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filena string comparator; size_t versionBegin = 0; for (auto character: versionString) - if (!isalpha(character)) + if (!isalpha(character, locale::classic())) { comparator += character; versionBegin++; diff --git a/test/TestCase.h b/test/TestCase.h index 5d4394b11..d63c88b48 100644 --- a/test/TestCase.h +++ b/test/TestCase.h @@ -90,7 +90,7 @@ protected: template static void skipWhitespace(IteratorType& _it, IteratorType _end) { - while (_it != _end && isspace(*_it)) + while (_it != _end && std::isspace(*_it, std::locale::classic())) ++_it; } diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp index f74b256d0..49482a6c6 100644 --- a/test/libsolidity/util/BytesUtils.cpp +++ b/test/libsolidity/util/BytesUtils.cpp @@ -22,6 +22,7 @@ #include #include +#include #include @@ -216,7 +217,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff) os << "\\n"; break; default: - if (isprint(v)) + if (isPrint(static_cast(v))) os << v; else os << "\\x" << toHex(v, HexCase::Lower); diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp index 6652f704a..dbaf52604 100644 --- a/test/libsolidity/util/TestFileParser.cpp +++ b/test/libsolidity/util/TestFileParser.cpp @@ -762,13 +762,16 @@ string TestFileParser::Scanner::scanString() // TODO: use fromHex() from CommonData char TestFileParser::Scanner::scanHexPart() { + auto toLower = [](char _c) -> char { return tolower(_c, locale::classic()); }; + auto isDigit = [](char _c) -> bool { return isdigit(_c, locale::classic()); }; + advance(); // skip 'x' int value{}; - if (isdigit(current())) + if (isDigit(current())) value = current() - '0'; - else if (tolower(current()) >= 'a' && tolower(current()) <= 'f') - value = tolower(current()) - 'a' + 10; + else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') + value = toLower(current()) - 'a' + 10; else BOOST_THROW_EXCEPTION(TestParserError("\\x used with no following hex digits.")); @@ -777,10 +780,10 @@ char TestFileParser::Scanner::scanHexPart() return static_cast(value); value <<= 4; - if (isdigit(current())) + if (isDigit(current())) value |= current() - '0'; - else if (tolower(current()) >= 'a' && tolower(current()) <= 'f') - value |= tolower(current()) - 'a' + 10; + else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') + value |= toLower(current()) - 'a' + 10; advance(); diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp index c6d52a62e..dce6c6162 100644 --- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp +++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp @@ -28,6 +28,7 @@ #include #include +#include #include @@ -53,7 +54,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size) string input(reinterpret_cast(_data), _size); if (std::any_of(input.begin(), input.end(), [](char c) { - return ((static_cast(c) > 127) || !(std::isprint(c) || (c == '\n') || (c == '\t'))); + return ((static_cast(c) > 127) || !(isPrint(c) || (c == '\n') || (c == '\t'))); })) return 0; diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp index 5c4f00f0a..ad98ab9be 100644 --- a/test/tools/yulopti.cpp +++ b/test/tools/yulopti.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -155,7 +156,7 @@ public: return ( !boost::algorithm::iequals(get<1>(_a), get<1>(_b)) ? boost::algorithm::lexicographical_compare(get<1>(_a), get<1>(_b), boost::algorithm::is_iless()) : - tolower(get<0>(_a)) < tolower(get<0>(_b)) + toLower(get<0>(_a)) < toLower(get<0>(_b)) ); }); From 519e1c9402f83e26bf93186a3facc440dd1b770c Mon Sep 17 00:00:00 2001 From: Tyler Date: Sun, 6 Mar 2022 23:25:35 -0500 Subject: [PATCH 04/58] Specify namespaces Fix references into solidity::util --- libsolidity/analysis/ControlFlowAnalyzer.cpp | 2 +- .../analysis/ControlFlowRevertPruner.cpp | 2 +- libsolidity/analysis/FunctionCallGraph.cpp | 2 +- libsolidity/analysis/PostTypeChecker.cpp | 4 +- .../analysis/PostTypeContractLevelChecker.cpp | 2 +- libsolidity/analysis/TypeChecker.cpp | 4 +- libsolidity/ast/AST.cpp | 4 +- libsolidity/ast/ASTJsonConverter.cpp | 2 +- libsolidity/codegen/CompilerContext.cpp | 2 +- libsolidity/codegen/ContractCompiler.cpp | 12 ++--- libsolidity/codegen/ExpressionCompiler.cpp | 8 ++-- libsolidity/codegen/LValue.cpp | 6 +-- libsolidity/codegen/ir/IRGenerator.cpp | 4 +- libsolidity/formal/CHC.cpp | 2 +- libsolidity/formal/Invariants.cpp | 2 +- libsolidity/formal/Predicate.cpp | 8 ++-- libsolidity/formal/SMTEncoder.cpp | 2 +- libsolidity/formal/SymbolicState.cpp | 2 +- libsolidity/formal/SymbolicTypes.cpp | 2 +- libsolidity/interface/CompilerStack.cpp | 14 +++--- libsolidity/lsp/LanguageServer.cpp | 4 +- libsolidity/lsp/Transport.h | 2 +- libsolutil/IpfsHash.cpp | 2 +- libyul/Object.cpp | 4 +- libyul/optimiser/DataFlowAnalyzer.cpp | 2 +- libyul/optimiser/EqualStoreEliminator.cpp | 4 +- solc/CommandLineInterface.cpp | 4 +- solc/CommandLineParser.cpp | 44 +++++++++---------- test/libsolidity/SemanticTest.cpp | 8 ++-- test/libsolidity/SolidityEndToEndTest.cpp | 4 +- .../SolidityExpressionCompiler.cpp | 2 +- test/libsolidity/SolidityOptimizer.cpp | 4 +- .../analysis/FunctionCallGraph.cpp | 1 + test/libsolidity/util/BytesUtils.cpp | 2 +- test/libsolidity/util/TestFunctionCall.cpp | 2 +- test/solc/CommandLineInterface.cpp | 1 + 36 files changed, 89 insertions(+), 87 deletions(-) diff --git a/libsolidity/analysis/ControlFlowAnalyzer.cpp b/libsolidity/analysis/ControlFlowAnalyzer.cpp index 0c64ac3b5..e80964ace 100644 --- a/libsolidity/analysis/ControlFlowAnalyzer.cpp +++ b/libsolidity/analysis/ControlFlowAnalyzer.cpp @@ -129,7 +129,7 @@ void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNod // Propagate changes to all exits and queue them for traversal, if needed. for (auto const& exit: currentNode->exits) if ( - auto exists = valueOrNullptr(nodeInfos, exit); + auto exists = util::valueOrNullptr(nodeInfos, exit); nodeInfos[exit].propagateFrom(nodeInfo) || !exists ) nodesToTraverse.insert(exit); diff --git a/libsolidity/analysis/ControlFlowRevertPruner.cpp b/libsolidity/analysis/ControlFlowRevertPruner.cpp index 9a44be57a..ae9c18a13 100644 --- a/libsolidity/analysis/ControlFlowRevertPruner.cpp +++ b/libsolidity/analysis/ControlFlowRevertPruner.cpp @@ -57,7 +57,7 @@ void ControlFlowRevertPruner::run() void ControlFlowRevertPruner::findRevertStates() { - std::set pendingFunctions = keys(m_functions); + std::set pendingFunctions = util::keys(m_functions); // We interrupt the search whenever we encounter a call to a function with (yet) unknown // revert behaviour. The ``wakeUp`` data structure contains information about which // searches to restart once we know about the behaviour. diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp index 265237128..45da1b4f0 100644 --- a/libsolidity/analysis/FunctionCallGraph.cpp +++ b/libsolidity/analysis/FunctionCallGraph.cpp @@ -97,7 +97,7 @@ CallGraph FunctionCallGraphBuilder::buildDeployedGraph( // assigned to state variables and as such may be reachable after deployment as well. builder.m_currentNode = CallGraph::SpecialNode::InternalDispatch; set defaultNode; - for (CallGraph::Node const& dispatchTarget: valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode)) + for (CallGraph::Node const& dispatchTarget: util::valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode)) { solAssert(!holds_alternative(dispatchTarget), ""); solAssert(get(dispatchTarget) != nullptr, ""); diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp index d08ee78b7..b5b973aa4 100644 --- a/libsolidity/analysis/PostTypeChecker.cpp +++ b/libsolidity/analysis/PostTypeChecker.cpp @@ -411,12 +411,12 @@ struct ReservedErrorSelector: public PostTypeChecker::Checker ); else { - uint32_t selector = selectorFromSignature32(_error.functionType(true)->externalSignature()); + uint32_t selector = util::selectorFromSignature32(_error.functionType(true)->externalSignature()); if (selector == 0 || ~selector == 0) m_errorReporter.syntaxError( 2855_error, _error.location(), - "The selector 0x" + toHex(toCompactBigEndian(selector, 4)) + " is reserved. Please rename the error to avoid the collision." + "The selector 0x" + util::toHex(toCompactBigEndian(selector, 4)) + " is reserved. Please rename the error to avoid the collision." ); } } diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.cpp b/libsolidity/analysis/PostTypeContractLevelChecker.cpp index 32927188f..38a192c22 100644 --- a/libsolidity/analysis/PostTypeContractLevelChecker.cpp +++ b/libsolidity/analysis/PostTypeContractLevelChecker.cpp @@ -52,7 +52,7 @@ bool PostTypeContractLevelChecker::check(ContractDefinition const& _contract) for (ErrorDefinition const* error: _contract.interfaceErrors()) { string signature = error->functionType(true)->externalSignature(); - uint32_t hash = selectorFromSignature32(signature); + uint32_t hash = util::selectorFromSignature32(signature); // Fail if there is a different signature for the same hash. if (!errorHashes[hash].empty() && !errorHashes[hash].count(signature)) { diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 74701bde0..00b68b896 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -659,7 +659,7 @@ void TypeChecker::visitManually( if (auto const* modifierContract = dynamic_cast(modifierDecl->scope())) if (m_currentContract) { - if (!contains(m_currentContract->annotation().linearizedBaseContracts, modifierContract)) + if (!util::contains(m_currentContract->annotation().linearizedBaseContracts, modifierContract)) m_errorReporter.typeError( 9428_error, _modifier.location(), @@ -2137,7 +2137,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa functionPointerType->declaration().scope() == m_currentContract ) msg += " Did you forget to prefix \"this.\"?"; - else if (contains( + else if (util::contains( m_currentContract->annotation().linearizedBaseContracts, functionPointerType->declaration().scope() ) && functionPointerType->declaration().scope() != m_currentContract) diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp index 2a7609de8..be6f2fe9b 100644 --- a/libsolidity/ast/AST.cpp +++ b/libsolidity/ast/AST.cpp @@ -221,7 +221,7 @@ vector const ContractDefinition::usedInterfaceEvents() c { solAssert(annotation().creationCallGraph.set(), ""); - return convertContainer>( + return util::convertContainer>( (*annotation().creationCallGraph)->emittedEvents + (*annotation().deployedCallGraph)->emittedEvents ); @@ -239,7 +239,7 @@ vector ContractDefinition::interfaceErrors(bool _require result += (*annotation().creationCallGraph)->usedErrors + (*annotation().deployedCallGraph)->usedErrors; - return convertContainer>(move(result)); + return util::convertContainer>(move(result)); } vector, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp index 97417f81c..06807e9df 100644 --- a/libsolidity/ast/ASTJsonConverter.cpp +++ b/libsolidity/ast/ASTJsonConverter.cpp @@ -505,7 +505,7 @@ bool ASTJsonConverter::visit(EventDefinition const& _node) _attributes.emplace_back( make_pair( "eventSelector", - toHex(u256(h256::Arith(util::keccak256(_node.functionType(true)->externalSignature())))) + toHex(u256(util::h256::Arith(util::keccak256(_node.functionType(true)->externalSignature())))) )); setJsonNode(_node, "EventDefinition", std::move(_attributes)); diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 700f53d1f..9bc035806 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -403,7 +403,7 @@ void CompilerContext::appendInlineAssembly( { if (_insideFunction) return false; - return contains(_localVariables, _identifier.name.str()); + return util::contains(_localVariables, _identifier.name.str()); }; identifierAccess.generateCode = [&]( yul::Identifier const& _identifier, diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 5abc64636..d2c71e2af 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -235,7 +235,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract) m_context.pushSubroutineOffset(m_context.runtimeSub()); // This code replaces the address added by appendDeployTimeAddress(). m_context.appendInlineAssembly( - Whiskers(R"( + util::Whiskers(R"( { // If code starts at 11, an mstore(0) writes to the full PUSH20 plus data // without the need for a shift. @@ -672,7 +672,7 @@ bool ContractCompiler::visit(FunctionDefinition const& _function) BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_function.location()) << - errinfo_comment("Stack too deep, try removing local variables.") + util::errinfo_comment("Stack too deep, try removing local variables.") ); while (!stackLayout.empty() && stackLayout.back() != static_cast(stackLayout.size() - 1)) if (stackLayout.back() < 0) @@ -842,7 +842,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly) BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_inlineAssembly.location()) << - errinfo_comment("Stack too deep, try removing local variables.") + util::errinfo_comment("Stack too deep, try removing local variables.") ); _assembly.appendInstruction(dupInstruction(stackDiff)); } @@ -916,7 +916,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly) BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_inlineAssembly.location()) << - errinfo_comment("Stack too deep(" + to_string(stackDiff) + "), try removing local variables.") + util::errinfo_comment("Stack too deep(" + to_string(stackDiff) + "), try removing local variables.") ); _assembly.appendInstruction(swapInstruction(stackDiff)); _assembly.appendInstruction(Instruction::POP); @@ -1045,7 +1045,7 @@ void ContractCompiler::handleCatch(vector> const& _ca solAssert(m_context.evmVersion().supportsReturndata(), ""); // stack: - m_context << Instruction::DUP1 << selectorFromSignature32("Error(string)") << Instruction::EQ; + m_context << Instruction::DUP1 << util::selectorFromSignature32("Error(string)") << Instruction::EQ; m_context << Instruction::ISZERO; m_context.appendConditionalJumpTo(panicTag); m_context << Instruction::POP; // remove selector @@ -1077,7 +1077,7 @@ void ContractCompiler::handleCatch(vector> const& _ca solAssert(m_context.evmVersion().supportsReturndata(), ""); // stack: - m_context << selectorFromSignature32("Panic(uint256)") << Instruction::EQ; + m_context << util::selectorFromSignature32("Panic(uint256)") << Instruction::EQ; m_context << Instruction::ISZERO; m_context.appendConditionalJumpTo(fallbackTag); diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index e4ad4cf7e..1eefe41b9 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -268,7 +268,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const& BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_varDecl.location()) << - errinfo_comment("Stack too deep.") + util::errinfo_comment("Stack too deep.") ); m_context << dupInstruction(retSizeOnStack + 1); m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction); @@ -350,7 +350,7 @@ bool ExpressionCompiler::visit(Assignment const& _assignment) BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_assignment.location()) << - errinfo_comment("Stack too deep, try removing local variables.") + util::errinfo_comment("Stack too deep, try removing local variables.") ); // value [lvalue_ref] updated_value for (unsigned i = 0; i < itemSize; ++i) @@ -1452,7 +1452,7 @@ bool ExpressionCompiler::visit(FunctionCallOptions const& _functionCallOptions) solAssert(false, "Unexpected option name!"); acceptAndConvert(*_functionCallOptions.options()[i], *requiredType); - solAssert(!contains(presentOptions, newOption), ""); + solAssert(!util::contains(presentOptions, newOption), ""); ptrdiff_t insertPos = presentOptions.end() - lower_bound(presentOptions.begin(), presentOptions.end(), newOption); utils().moveIntoStack(static_cast(insertPos), 1); @@ -2862,7 +2862,7 @@ void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaratio else BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_sourceLocation(_expression.location()) - << errinfo_comment("Identifier type not supported or identifier not found.")); + << util::errinfo_comment("Identifier type not supported or identifier not found.")); } void ExpressionCompiler::setLValueToStorageItem(Expression const& _expression) diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp index bd9252953..379e9818b 100644 --- a/libsolidity/codegen/LValue.cpp +++ b/libsolidity/codegen/LValue.cpp @@ -50,7 +50,7 @@ void StackVariable::retrieveValue(SourceLocation const& _location, bool) const BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_location) << - errinfo_comment("Stack too deep, try removing local variables.") + util::errinfo_comment("Stack too deep, try removing local variables.") ); solAssert(stackPos + 1 >= m_size, "Size and stack pos mismatch."); for (unsigned i = 0; i < m_size; ++i) @@ -64,7 +64,7 @@ void StackVariable::storeValue(Type const&, SourceLocation const& _location, boo BOOST_THROW_EXCEPTION( StackTooDeepError() << errinfo_sourceLocation(_location) << - errinfo_comment("Stack too deep, try removing local variables.") + util::errinfo_comment("Stack too deep, try removing local variables.") ); else if (stackDiff > 0) for (unsigned i = 0; i < m_size; ++i) @@ -436,7 +436,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc BOOST_THROW_EXCEPTION( InternalCompilerError() << errinfo_sourceLocation(_location) - << errinfo_comment("Invalid non-value type for assignment.")); + << util::errinfo_comment("Invalid non-value type for assignment.")); } } diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp index 6b52010d9..84ccef94e 100644 --- a/libsolidity/codegen/ir/IRGenerator.cpp +++ b/libsolidity/codegen/ir/IRGenerator.cpp @@ -234,7 +234,7 @@ string IRGenerator::generate( t("deployedFunctions", m_context.functionCollector().requestedFunctions()); t("deployedSubObjects", subObjectSources(m_context.subObjectsCreated())); t("metadataName", yul::Object::metadataName()); - t("cborMetadata", toHex(_cborMetadata)); + t("cborMetadata", util::toHex(_cborMetadata)); t("useSrcMapDeployed", formatUseSrcMap(m_context)); @@ -788,7 +788,7 @@ pair>> IRGenerator::evalua { bool operator()(ContractDefinition const* _c1, ContractDefinition const* _c2) const { - solAssert(contains(linearizedBaseContracts, _c1) && contains(linearizedBaseContracts, _c2), ""); + solAssert(util::contains(linearizedBaseContracts, _c1) && util::contains(linearizedBaseContracts, _c2), ""); auto it1 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c1); auto it2 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c2); return it1 < it2; diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp index 9e31d7fc9..8f7bc5dbc 100644 --- a/libsolidity/formal/CHC.cpp +++ b/libsolidity/formal/CHC.cpp @@ -1497,7 +1497,7 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall) auto const* contract = function->annotation().contract; auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts; - solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || contains(hierarchy, contract), ""); + solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), ""); bool usesStaticCall = function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View; diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp index 9dad0722c..10d342ed4 100644 --- a/libsolidity/formal/Invariants.cpp +++ b/libsolidity/formal/Invariants.cpp @@ -48,7 +48,7 @@ map> collectInvariants( map> equalities; // Collect equalities where one of the sides is a predicate we're interested in. - BreadthFirstSearch{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) { + util::BreadthFirstSearch{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) { if (_expr->name == "=") for (auto const& t: targets) { diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp index 6e0eb4f3b..91513a00c 100644 --- a/libsolidity/formal/Predicate.cpp +++ b/libsolidity/formal/Predicate.cpp @@ -350,7 +350,7 @@ vector> Predicate::summaryStateValues(vector stateArgs(stateFirst, stateLast); solAssert(stateArgs.size() == stateVars->size(), ""); - auto stateTypes = applyMap(*stateVars, [&](auto const& _var) { return _var->type(); }); + auto stateTypes = util::applyMap(*stateVars, [&](auto const& _var) { return _var->type(); }); return formatExpressions(stateArgs, stateTypes); } @@ -412,7 +412,7 @@ pair>, vector> Predicate::lo auto first = _args.end() - static_cast(localVars.size()); vector outValues(first, _args.end()); - auto mask = applyMap( + auto mask = util::applyMap( localVars, [this](auto _var) { auto varScope = dynamic_cast(_var->scope()); @@ -422,7 +422,7 @@ pair>, vector> Predicate::lo auto localVarsInScope = util::filter(localVars, mask); auto outValuesInScope = util::filter(outValues, mask); - auto outTypes = applyMap(localVarsInScope, [](auto _var) { return _var->type(); }); + auto outTypes = util::applyMap(localVarsInScope, [](auto _var) { return _var->type(); }); return {formatExpressions(outValuesInScope, outTypes), localVarsInScope}; } @@ -496,7 +496,7 @@ optional Predicate::expressionToString(smtutil::Expression const& _expr, if (_expr.name == "0") return "0x0"; // For some reason the code below returns "0x" for "0". - return toHex(toCompactBigEndian(bigint(_expr.name)), HexPrefix::Add, HexCase::Lower); + return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower); } catch (out_of_range const&) { diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp index 76342ba08..e699e28b8 100644 --- a/libsolidity/formal/SMTEncoder.cpp +++ b/libsolidity/formal/SMTEncoder.cpp @@ -313,7 +313,7 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm) { auto const& vars = _assignment.variableNames; for (auto const& identifier: vars) - if (auto externalInfo = valueOrNullptr(externalReferences, &identifier)) + if (auto externalInfo = util::valueOrNullptr(externalReferences, &identifier)) if (auto varDecl = dynamic_cast(externalInfo->declaration)) assignedVars.insert(varDecl); } diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp index 6612723d0..b1fd7978f 100644 --- a/libsolidity/formal/SymbolicState.cpp +++ b/libsolidity/formal/SymbolicState.cpp @@ -211,7 +211,7 @@ void SymbolicState::buildABIFunctions(set const& _abiFuncti auto argTypes = [](auto const& _args) { - return applyMap(_args, [](auto arg) { return arg->annotation().type; }); + return util::applyMap(_args, [](auto arg) { return arg->annotation().type; }); }; /// Since each abi.* function may have a different number of input/output parameters, diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp index b9041c6bd..e40ff9245 100644 --- a/libsolidity/formal/SymbolicTypes.cpp +++ b/libsolidity/formal/SymbolicTypes.cpp @@ -580,7 +580,7 @@ optional symbolicTypeConversion(frontend::Type const* _from return smtutil::Expression(size_t(0)); auto bytesVec = util::asBytes(strType->value()); bytesVec.resize(fixedBytesType->numBytes(), 0); - return smtutil::Expression(u256(toHex(bytesVec, util::HexPrefix::Add))); + return smtutil::Expression(u256(util::toHex(bytesVec, util::HexPrefix::Add))); } return std::nullopt; diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 7a8bc4ddb..3eb25987d 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -278,7 +278,7 @@ void CompilerStack::setMetadataHash(MetadataHash _metadataHash) void CompilerStack::selectDebugInfo(DebugInfoSelection _debugInfoSelection) { if (m_stackState >= CompilationSuccessful) - BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Must select debug info components before compilation.")); + BOOST_THROW_EXCEPTION(CompilerError() << util::errinfo_comment("Must select debug info components before compilation.")); m_debugInfoSelection = _debugInfoSelection; } @@ -573,7 +573,7 @@ bool CompilerStack::analyze() if (noErrors) { ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile); - auto allSources = applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; }); + auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; }); modelChecker.enableAllEnginesIfPragmaPresent(allSources); modelChecker.checkRequestedSourcesAndContracts(allSources); for (Source const* source: m_sourceOrder) @@ -1030,7 +1030,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors()) { string signature = error->functionType(true)->externalSignature(); - interfaceSymbols["errors"][signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4)); + interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignature32(signature), 4)); } for (EventDefinition const* event: ranges::concat_view( @@ -1040,7 +1040,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const if (!event->isAnonymous()) { string signature = event->functionType(true)->externalSignature(); - interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(keccak256(signature)))); + interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(util::keccak256(signature)))); } return interfaceSymbols; @@ -1494,7 +1494,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con continue; solAssert(s.second.charStream, "Character stream not available"); - meta["sources"][s.first]["keccak256"] = "0x" + toHex(s.second.keccak256().asBytes()); + meta["sources"][s.first]["keccak256"] = "0x" + util::toHex(s.second.keccak256().asBytes()); if (optional licenseString = s.second.ast->licenseString()) meta["sources"][s.first]["license"] = *licenseString; if (m_metadataLiteralSources) @@ -1502,7 +1502,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con else { meta["sources"][s.first]["urls"] = Json::arrayValue; - meta["sources"][s.first]["urls"].append("bzz-raw://" + toHex(s.second.swarmHash().asBytes())); + meta["sources"][s.first]["urls"].append("bzz-raw://" + util::toHex(s.second.swarmHash().asBytes())); meta["sources"][s.first]["urls"].append(s.second.ipfsUrl()); } } @@ -1565,7 +1565,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con meta["settings"]["libraries"] = Json::objectValue; for (auto const& library: m_libraries) - meta["settings"]["libraries"][library.first] = "0x" + toHex(library.second.asBytes()); + meta["settings"]["libraries"][library.first] = "0x" + util::toHex(library.second.asBytes()); meta["output"]["abi"] = contractABI(_contract); meta["output"]["userdoc"] = natspecUser(_contract); diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp index fb704d819..bda55b26d 100644 --- a/libsolidity/lsp/LanguageServer.cpp +++ b/libsolidity/lsp/LanguageServer.cpp @@ -253,7 +253,7 @@ bool LanguageServer::run() string const methodName = (*jsonMessage)["method"].asString(); id = (*jsonMessage)["id"]; - if (auto handler = valueOrDefault(m_handlers, methodName)) + if (auto handler = util::valueOrDefault(m_handlers, methodName)) handler(id, (*jsonMessage)["params"]); else m_client.error(id, ErrorCode::MethodNotFound, "Unknown method " + methodName); @@ -375,7 +375,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args) lspAssert( change && change->hasText(), ErrorCode::RequestFailed, - "Invalid source range: " + jsonCompactPrint(jsonContentChange["range"]) + "Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"]) ); string buffer = m_fileRepository.sourceUnits().at(sourceUnitName); diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h index 2d0b49517..82fe43909 100644 --- a/libsolidity/lsp/Transport.h +++ b/libsolidity/lsp/Transport.h @@ -69,7 +69,7 @@ private: { \ BOOST_THROW_EXCEPTION( \ RequestError(errorCode) << \ - errinfo_comment(errorMessage) \ + util::errinfo_comment(errorMessage) \ ); \ } diff --git a/libsolutil/IpfsHash.cpp b/libsolutil/IpfsHash.cpp index a34ee035b..dbf411dc7 100644 --- a/libsolutil/IpfsHash.cpp +++ b/libsolutil/IpfsHash.cpp @@ -59,7 +59,7 @@ bytes encodeLinkData(bytes const& _data) string base58Encode(bytes const& _data) { static string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"}; - bigint data(toHex(_data, HexPrefix::Add)); + bigint data(util::toHex(_data, HexPrefix::Add)); string output; while (data) { diff --git a/libyul/Object.cpp b/libyul/Object.cpp index ed456ab53..cf68ff765 100644 --- a/libyul/Object.cpp +++ b/libyul/Object.cpp @@ -91,13 +91,13 @@ string Object::toString( set Object::qualifiedDataNames() const { set qualifiedNames = - name.empty() || contains(name.str(), '.') ? + name.empty() || util::contains(name.str(), '.') ? set{} : set{name}; for (shared_ptr const& subObjectNode: subObjects) { yulAssert(qualifiedNames.count(subObjectNode->name) == 0, ""); - if (contains(subObjectNode->name.str(), '.')) + if (util::contains(subObjectNode->name.str(), '.')) continue; qualifiedNames.insert(subObjectNode->name); if (auto const* subObject = dynamic_cast(subObjectNode.get())) diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp index af25cde59..c1ad2116a 100644 --- a/libyul/optimiser/DataFlowAnalyzer.cpp +++ b/libyul/optimiser/DataFlowAnalyzer.cpp @@ -367,7 +367,7 @@ void DataFlowAnalyzer::joinKnowledgeHelper( // of m_memory and thus any overlapping write would have cleared the keys // that are not known to be different inside m_memory already. cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){ - YulString const* oldValue = valueOrNullptr(_older, key); + YulString const* oldValue = util::valueOrNullptr(_older, key); return !oldValue || *oldValue != currentValue; })); } diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp index dcba98ce4..56f9902f8 100644 --- a/libyul/optimiser/EqualStoreEliminator.cpp +++ b/libyul/optimiser/EqualStoreEliminator.cpp @@ -54,13 +54,13 @@ void EqualStoreEliminator::visit(Statement& _statement) { if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression)) { - if (auto const* currentValue = valueOrNullptr(m_storage, vars->first)) + if (auto const* currentValue = util::valueOrNullptr(m_storage, vars->first)) if (*currentValue == vars->second) m_pendingRemovals.insert(&_statement); } else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression)) { - if (auto const* currentValue = valueOrNullptr(m_memory, vars->first)) + if (auto const* currentValue = util::valueOrNullptr(m_memory, vars->first)) if (*currentValue == vars->second) m_pendingRemovals.insert(&_statement); } diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp index 24e4ee7dd..03679bd7c 100644 --- a/solc/CommandLineInterface.cpp +++ b/solc/CommandLineInterface.cpp @@ -464,7 +464,7 @@ void CommandLineInterface::readInputFiles() for (auto const& [sourceUnitName, normalizedInputPaths]: collisions) { message += sourceUnitName + " matches: "; - message += joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n"; + message += util::joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n"; } solThrow(CommandLineValidationError, message); @@ -963,7 +963,7 @@ void CommandLineInterface::link() string foundPlaceholder(it, it + placeholderSize); if (librariesReplacements.count(foundPlaceholder)) { - string hexStr(toHex(librariesReplacements.at(foundPlaceholder).asBytes())); + string hexStr(util::toHex(librariesReplacements.at(foundPlaceholder).asBytes())); copy(hexStr.begin(), hexStr.end(), it); } else diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp index 65c7d7862..8f6d549f2 100644 --- a/solc/CommandLineParser.cpp +++ b/solc/CommandLineParser.cpp @@ -166,7 +166,7 @@ ostream& operator<<(ostream& _out, CompilerOutputs const& _selection) if (_selection.*component) serializedSelection.push_back(CompilerOutputs::componentName(component)); - return _out << joinHumanReadable(serializedSelection, ","); + return _out << util::joinHumanReadable(serializedSelection, ","); } string const& CompilerOutputs::componentName(bool CompilerOutputs::* _component) @@ -197,7 +197,7 @@ ostream& operator<<(ostream& _out, CombinedJsonRequests const& _requests) if (_requests.*component) serializedRequests.push_back(CombinedJsonRequests::componentName(component)); - return _out << joinHumanReadable(serializedRequests, ","); + return _out << util::joinHumanReadable(serializedRequests, ","); } string const& CombinedJsonRequests::componentName(bool CombinedJsonRequests::* _component) @@ -343,17 +343,17 @@ void CommandLineParser::parseLibraryOption(string const& _input) try { if (fs::is_regular_file(_input)) - data = readFileAsString(_input); + data = util::readFileAsString(_input); } catch (fs::filesystem_error const&) { // Thrown e.g. if path is too long. } - catch (FileNotFound const&) + catch (util::FileNotFound const&) { // Should not happen if `fs::is_regular_file` is correct. } - catch (NotAFile const&) + catch (util::NotAFile const&) { // Should not happen if `fs::is_regular_file` is correct. } @@ -418,15 +418,15 @@ void CommandLineParser::parseLibraryOption(string const& _input) "Invalid length for address for library \"" + libName + "\": " + to_string(addrString.length()) + " instead of 40 characters." ); - if (!passesAddressChecksum(addrString, false)) + if (!util::passesAddressChecksum(addrString, false)) solThrow( CommandLineValidationError, "Invalid checksum on address for library \"" + libName + "\": " + addrString + "\n" - "The correct checksum is " + getChecksummedAddress(addrString) + "The correct checksum is " + util::getChecksummedAddress(addrString) ); - bytes binAddr = fromHex(addrString); - h160 address(binAddr, h160::AlignRight); - if (binAddr.size() > 20 || address == h160()) + bytes binAddr = util::fromHex(addrString); + util::h160 address(binAddr, util::h160::AlignRight); + if (binAddr.size() > 20 || address == util::h160()) solThrow( CommandLineValidationError, "Invalid address for library \"" + libName + "\": " + addrString @@ -461,9 +461,9 @@ void CommandLineParser::parseOutputSelection() solAssert(false); case InputMode::Compiler: case InputMode::CompilerWithASTImport: - return contains(compilerModeOutputs, _outputName); + return util::contains(compilerModeOutputs, _outputName); case InputMode::Assembler: - return contains(assemblerModeOutputs, _outputName); + return util::contains(assemblerModeOutputs, _outputName); case InputMode::StandardJson: case InputMode::Linker: return false; @@ -582,15 +582,15 @@ General Information)").c_str(), ) ( g_strRevertStrings.c_str(), - po::value()->value_name(joinHumanReadable(g_revertStringsArgs, ",")), + po::value()->value_name(util::joinHumanReadable(g_revertStringsArgs, ",")), "Strip revert (and require) reason strings or add additional debugging information." ) ( g_strDebugInfo.c_str(), - po::value()->default_value(toString(DebugInfoSelection::Default())), + po::value()->default_value(util::toString(DebugInfoSelection::Default())), ("Debug info components to be included in the produced EVM assembly and Yul code. " "Value can be all, none or a comma-separated list containing one or more of the " - "following components: " + joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str() + "following components: " + util::joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str() ) ( g_strStopAfter.c_str(), @@ -648,12 +648,12 @@ General Information)").c_str(), assemblyModeOptions.add_options() ( g_strMachine.c_str(), - po::value()->value_name(joinHumanReadable(g_machineArgs, ",")), + po::value()->value_name(util::joinHumanReadable(g_machineArgs, ",")), "Target machine in assembly or Yul mode." ) ( g_strYulDialect.c_str(), - po::value()->value_name(joinHumanReadable(g_yulDialectArgs, ",")), + po::value()->value_name(util::joinHumanReadable(g_yulDialectArgs, ",")), "Input dialect to use in assembly or yul mode." ) ; @@ -726,7 +726,7 @@ General Information)").c_str(), ) ( g_strCombinedJson.c_str(), - po::value()->value_name(joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")), + po::value()->value_name(util::joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")), "Output a single json document containing the specified information." ) ; @@ -736,7 +736,7 @@ General Information)").c_str(), metadataOptions.add_options() ( g_strMetadataHash.c_str(), - po::value()->value_name(joinHumanReadable(g_metadataHashArgs, ",")), + po::value()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")), "Choose hash method for the bytecode metadata or disable it." ) ( @@ -1011,11 +1011,11 @@ void CommandLineParser::processArgs() if (m_args.count(g_strPrettyJson) > 0) { - m_options.formatting.json.format = JsonFormat::Pretty; + m_options.formatting.json.format = util::JsonFormat::Pretty; } if (!m_args[g_strJsonIndent].defaulted()) { - m_options.formatting.json.format = JsonFormat::Pretty; + m_options.formatting.json.format = util::JsonFormat::Pretty; m_options.formatting.json.indent = m_args[g_strJsonIndent].as(); } @@ -1289,7 +1289,7 @@ size_t CommandLineParser::countEnabledOptions(vector const& _optionNames string CommandLineParser::joinOptionNames(vector const& _optionNames, string _separator) { - return joinHumanReadable( + return util::joinHumanReadable( _optionNames | ranges::views::transform([](string const& _option){ return "--" + _option; }), _separator ); diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp index 1f07f177d..3c26f5a97 100644 --- a/test/libsolidity/SemanticTest.cpp +++ b/test/libsolidity/SemanticTest.cpp @@ -70,10 +70,10 @@ SemanticTest::SemanticTest( static set const legacyRunTriggers{"also", "false", "default"}; string compileViaYul = m_reader.stringSetting("compileViaYul", "default"); - if (!contains(compileViaYulAllowedValues, compileViaYul)) + if (!util::contains(compileViaYulAllowedValues, compileViaYul)) BOOST_THROW_EXCEPTION(runtime_error("Invalid compileViaYul value: " + compileViaYul + ".")); - m_testCaseWantsYulRun = contains(yulRunTriggers, compileViaYul); - m_testCaseWantsLegacyRun = contains(legacyRunTriggers, compileViaYul); + m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul); + m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul); // Do not enforce via yul and ewasm, if via yul was explicitly denied. if (compileViaYul == "false") @@ -189,7 +189,7 @@ vector SemanticTest::makeSideEffectHooks() const { vector result; for (auto const& argument: _call.arguments.parameters) - result.emplace_back(toHex(argument.rawBytes)); + result.emplace_back(util::toHex(argument.rawBytes)); return result; } return {}; diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 314d4283e..42c455f4c 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -4074,12 +4074,12 @@ BOOST_AUTO_TEST_CASE(strip_reason_strings) m_optimiserSettings == OptimiserSettings::none() ) // check that the reason string IS part of the binary. - BOOST_CHECK(toHex(m_output).find("736f6d6520726561736f6e") != std::string::npos); + BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") != std::string::npos); m_revertStrings = RevertStrings::Strip; compileAndRun(sourceCode, 0, "C"); // check that the reason string is NOT part of the binary. - BOOST_CHECK(toHex(m_output).find("736f6d6520726561736f6e") == std::string::npos); + BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") == std::string::npos); ABI_CHECK(callContractFunction("f(bool)", true), encodeArgs(7)); ABI_CHECK(callContractFunction("f(bool)", false), encodeArgs()); diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index 5f7b8d472..4fef140e8 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -350,7 +350,7 @@ BOOST_AUTO_TEST_CASE(arithmetic) uint8_t(Instruction::JUMPDEST), uint8_t(Instruction::PUSH32) } + - fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") + + util::fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") + bytes{ uint8_t(Instruction::PUSH1), 0x0, uint8_t(Instruction::MSTORE), diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp index eb4102b15..a1580fb53 100644 --- a/test/libsolidity/SolidityOptimizer.cpp +++ b/test/libsolidity/SolidityOptimizer.cpp @@ -98,8 +98,8 @@ public: BOOST_CHECK_MESSAGE(!optimizedOutput.empty(), "No optimized output for " + _sig); BOOST_CHECK_MESSAGE(!nonOptimizedOutput.empty(), "No un-optimized output for " + _sig); BOOST_CHECK_MESSAGE(nonOptimizedOutput == optimizedOutput, "Computed values do not match." - "\nNon-Optimized: " + toHex(nonOptimizedOutput) + - "\nOptimized: " + toHex(optimizedOutput)); + "\nNon-Optimized: " + util::toHex(nonOptimizedOutput) + + "\nOptimized: " + util::toHex(optimizedOutput)); } /// @returns the number of instructions in the given bytecode, not taking the metadata hash diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp index 30477aa2e..7b67aeb44 100644 --- a/test/libsolidity/analysis/FunctionCallGraph.cpp +++ b/test/libsolidity/analysis/FunctionCallGraph.cpp @@ -47,6 +47,7 @@ #include using namespace std; +using namespace solidity::util; using namespace solidity::langutil; using namespace solidity::frontend; diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp index f74b256d0..3c711f022 100644 --- a/test/libsolidity/util/BytesUtils.cpp +++ b/test/libsolidity/util/BytesUtils.cpp @@ -219,7 +219,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff) if (isprint(v)) os << v; else - os << "\\x" << toHex(v, HexCase::Lower); + os << "\\x" << util::toHex(v, HexCase::Lower); } } os << "\""; diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp index 43805c8f9..c51dbec97 100644 --- a/test/libsolidity/util/TestFunctionCall.cpp +++ b/test/libsolidity/util/TestFunctionCall.cpp @@ -324,7 +324,7 @@ string TestFunctionCall::formatRawParameters( for (auto const c: param.rawString) // NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler // chooses the one for bytes if the second argument is omitted. - os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast(c), HexCase::Lower)); + os << (c >= ' ' ? string(1, c) : "\\x" + util::toHex(static_cast(c), HexCase::Lower)); if (¶m != &_params.back()) os << ", "; } diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp index 169437f3c..d5cb39a83 100644 --- a/test/solc/CommandLineInterface.cpp +++ b/test/solc/CommandLineInterface.cpp @@ -43,6 +43,7 @@ using namespace std; using namespace solidity::frontend; using namespace solidity::test; +using namespace solidity::util; using PathSet = set; From 7bd6cba79c040648d0e4c4180c60760fecea5c64 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 9 Mar 2022 10:41:57 +0100 Subject: [PATCH 05/58] Provide generic access to type definition for user-defined types. --- libsolidity/ast/Types.cpp | 15 +++++++++++++++ libsolidity/ast/Types.h | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index c84d79785..77e9af866 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -2341,6 +2341,11 @@ TypeResult StructType::interfaceType(bool _inLibrary) const return *m_interfaceType_library; } +Declaration const* StructType::typeDefinition() const +{ + return &structDefinition(); +} + BoolResult StructType::validForLocation(DataLocation _loc) const { for (auto const& member: m_struct.members()) @@ -2473,6 +2478,11 @@ Type const* EnumType::encodingType() const return TypeProvider::uint(8); } +Declaration const* EnumType::typeDefinition() const +{ + return &enumDefinition(); +} + TypeResult EnumType::unaryOperatorResult(Token _operator) const { return _operator == Token::Delete ? TypeProvider::emptyTuple() : nullptr; @@ -2541,6 +2551,11 @@ Type const& UserDefinedValueType::underlyingType() const return *type; } +Declaration const* UserDefinedValueType::typeDefinition() const +{ + return &m_definition; +} + string UserDefinedValueType::richIdentifier() const { return "t_userDefinedValueType" + parenthesizeIdentifier(m_definition.name()) + to_string(m_definition.id()); diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h index 9b030f65a..9b3080769 100644 --- a/libsolidity/ast/Types.h +++ b/libsolidity/ast/Types.h @@ -369,6 +369,10 @@ public: /// are returned without modification. virtual TypeResult interfaceType(bool /*_inLibrary*/) const { return nullptr; } + /// @returns the declaration of a user defined type (enum, struct, user defined value type). + /// Returns nullptr otherwise. + virtual Declaration const* typeDefinition() const { return nullptr; } + /// Clears all internally cached values (if any). virtual void clearCache() const; @@ -1004,6 +1008,8 @@ public: Type const* encodingType() const override; TypeResult interfaceType(bool _inLibrary) const override; + Declaration const* typeDefinition() const override; + BoolResult validForLocation(DataLocation _loc) const override; bool recursive() const; @@ -1069,6 +1075,8 @@ public: return _inLibrary ? this : encodingType(); } + Declaration const* typeDefinition() const override; + EnumDefinition const& enumDefinition() const { return m_enum; } /// @returns the value that the string has in the Enum unsigned int memberValue(ASTString const& _member) const; @@ -1101,6 +1109,9 @@ public: TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; } Type const* encodingType() const override { return &underlyingType(); } TypeResult interfaceType(bool /* _inLibrary */) const override {return &underlyingType(); } + + Declaration const* typeDefinition() const override; + std::string richIdentifier() const override; bool operator==(Type const& _other) const override; From b3daef766525459a7f624b0a66d667a76044194c Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Mon, 7 Mar 2022 13:31:55 +0100 Subject: [PATCH 06/58] [CMake] Refactor libsolc linker flag for EXPORTED_FUNCTIONS and make it more readable. --- cmake/EthUtils.cmake | 8 ++++++++ libsolc/CMakeLists.txt | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cmake/EthUtils.cmake b/cmake/EthUtils.cmake index fca41107e..44b92f4a0 100644 --- a/cmake/EthUtils.cmake +++ b/cmake/EthUtils.cmake @@ -48,3 +48,11 @@ function(detect_stray_source_files FILELIST DIRECTORY) message(SEND_ERROR "The following source files are present but are not compiled: ${sources}") endif() endfunction(detect_stray_source_files) + +# CreateExportedFunctionsForEMSDK(OUTPUT_VARIABLE Symbol1 Symbol2 ... SymbolN) +function(CreateExportedFunctionsForEMSDK OUTPUT_VARIABLE) + list(TRANSFORM ARGN PREPEND "\"_") + list(TRANSFORM ARGN APPEND "\"") + list(JOIN ARGN "," ARGN) + set(${OUTPUT_VARIABLE} "[${ARGN}]" PARENT_SCOPE) +endfunction() diff --git a/libsolc/CMakeLists.txt b/libsolc/CMakeLists.txt index 776b97ca5..fce54dd24 100644 --- a/libsolc/CMakeLists.txt +++ b/libsolc/CMakeLists.txt @@ -1,8 +1,17 @@ if (EMSCRIPTEN) + CreateExportedFunctionsForEMSDK( + ExportedFunctions + solidity_license + solidity_version + solidity_compile + solidity_alloc + solidity_free + solidity_reset + ) # Specify which functions to export in soljson.js. # Note that additional Emscripten-generated methods needed by solc-js are # defined to be exported in cmake/EthCompilerSettings.cmake. - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='[\"_solidity_license\",\"_solidity_version\",\"_solidity_compile\",\"_solidity_alloc\",\"_solidity_free\",\"_solidity_reset\"]'") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='${ExportedFunctions}'") add_executable(soljson libsolc.cpp libsolc.h) target_link_libraries(soljson PRIVATE solidity) else() From 859869c4ddf27c29d56a99a250ce5e45ef19e2d1 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 9 Mar 2022 16:03:57 +0100 Subject: [PATCH 07/58] Simplify peephole optimizer template. --- libevmasm/PeepholeOptimiser.cpp | 73 +++++++++++---------------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp index 8e4a09fcc..b04c2158c 100644 --- a/libevmasm/PeepholeOptimiser.cpp +++ b/libevmasm/PeepholeOptimiser.cpp @@ -41,51 +41,28 @@ struct OptimiserState std::back_insert_iterator out; }; -template -struct ApplyRule +template +struct FunctionParameterCount; +template +struct FunctionParameterCount { -}; -template -struct ApplyRule -{ - static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator _out) - { - return Method::applySimple(_in[0], _in[1], _in[2], _in[3], _out); - } -}; -template -struct ApplyRule -{ - static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator _out) - { - return Method::applySimple(_in[0], _in[1], _in[2], _out); - } -}; -template -struct ApplyRule -{ - static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator _out) - { - return Method::applySimple(_in[0], _in[1], _out); - } -}; -template -struct ApplyRule -{ - static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator _out) - { - return Method::applySimple(_in[0], _out); - } + static constexpr auto value = sizeof...(Args); }; -template +template struct SimplePeepholeOptimizerMethod { + template + static bool applyRule(AssemblyItems::const_iterator _in, back_insert_iterator _out, index_sequence) + { + return Method::applySimple(_in[Indices]..., _out); + } static bool apply(OptimiserState& _state) { + static constexpr size_t WindowSize = FunctionParameterCount::value - 1; if ( _state.i + WindowSize <= _state.items.size() && - ApplyRule::applyRule(_state.items.begin() + static_cast(_state.i), _state.out) + applyRule(_state.items.begin() + static_cast(_state.i), _state.out, make_index_sequence{}) ) { _state.i += WindowSize; @@ -96,7 +73,7 @@ struct SimplePeepholeOptimizerMethod } }; -struct Identity: SimplePeepholeOptimizerMethod +struct Identity: SimplePeepholeOptimizerMethod { static bool applySimple(AssemblyItem const& _item, std::back_insert_iterator _out) { @@ -105,7 +82,7 @@ struct Identity: SimplePeepholeOptimizerMethod } }; -struct PushPop: SimplePeepholeOptimizerMethod +struct PushPop: SimplePeepholeOptimizerMethod { static bool applySimple(AssemblyItem const& _push, AssemblyItem const& _pop, std::back_insert_iterator) { @@ -118,7 +95,7 @@ struct PushPop: SimplePeepholeOptimizerMethod } }; -struct OpPop: SimplePeepholeOptimizerMethod +struct OpPop: SimplePeepholeOptimizerMethod { static bool applySimple( AssemblyItem const& _op, @@ -140,7 +117,7 @@ struct OpPop: SimplePeepholeOptimizerMethod } }; -struct DoubleSwap: SimplePeepholeOptimizerMethod +struct DoubleSwap: SimplePeepholeOptimizerMethod { static size_t applySimple(AssemblyItem const& _s1, AssemblyItem const& _s2, std::back_insert_iterator) { @@ -148,7 +125,7 @@ struct DoubleSwap: SimplePeepholeOptimizerMethod } }; -struct DoublePush: SimplePeepholeOptimizerMethod +struct DoublePush: SimplePeepholeOptimizerMethod { static bool applySimple(AssemblyItem const& _push1, AssemblyItem const& _push2, std::back_insert_iterator _out) { @@ -163,7 +140,7 @@ struct DoublePush: SimplePeepholeOptimizerMethod } }; -struct CommutativeSwap: SimplePeepholeOptimizerMethod +struct CommutativeSwap: SimplePeepholeOptimizerMethod { static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator _out) { @@ -181,7 +158,7 @@ struct CommutativeSwap: SimplePeepholeOptimizerMethod } }; -struct SwapComparison: SimplePeepholeOptimizerMethod +struct SwapComparison: SimplePeepholeOptimizerMethod { static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator _out) { @@ -207,7 +184,7 @@ struct SwapComparison: SimplePeepholeOptimizerMethod }; /// Remove swapN after dupN -struct DupSwap: SimplePeepholeOptimizerMethod +struct DupSwap: SimplePeepholeOptimizerMethod { static size_t applySimple( AssemblyItem const& _dupN, @@ -230,7 +207,7 @@ struct DupSwap: SimplePeepholeOptimizerMethod }; -struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod +struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod { static size_t applySimple( AssemblyItem const& _iszero1, @@ -256,7 +233,7 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod } }; -struct JumpToNext: SimplePeepholeOptimizerMethod +struct JumpToNext: SimplePeepholeOptimizerMethod { static size_t applySimple( AssemblyItem const& _pushTag, @@ -282,7 +259,7 @@ struct JumpToNext: SimplePeepholeOptimizerMethod } }; -struct TagConjunctions: SimplePeepholeOptimizerMethod +struct TagConjunctions: SimplePeepholeOptimizerMethod { static bool applySimple( AssemblyItem const& _pushTag, @@ -317,7 +294,7 @@ struct TagConjunctions: SimplePeepholeOptimizerMethod } }; -struct TruthyAnd: SimplePeepholeOptimizerMethod +struct TruthyAnd: SimplePeepholeOptimizerMethod { static bool applySimple( AssemblyItem const& _push, From ce0a3e93f2e2a29a179d6c8d7f98b01310d7f909 Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Mon, 7 Mar 2022 12:49:23 +0100 Subject: [PATCH 08/58] Store whether an evmasm Assembly is creation code. --- Changelog.md | 1 + libevmasm/Assembly.cpp | 8 ++++--- libevmasm/Assembly.h | 6 ++++- libsolidity/codegen/CompilerContext.h | 2 +- libyul/AssemblyStack.cpp | 8 +++++-- libyul/backends/evm/AbstractAssembly.h | 2 +- libyul/backends/evm/EVMObjectCompiler.cpp | 5 +++- libyul/backends/evm/EthAssemblyAdapter.cpp | 4 ++-- libyul/backends/evm/EthAssemblyAdapter.h | 2 +- libyul/backends/evm/NoOutputAssembly.cpp | 2 +- libyul/backends/evm/NoOutputAssembly.h | 2 +- test/cmdlineTests/yul_optimize_runs/output | 5 ++-- test/libevmasm/Assembler.cpp | 18 +++++++------- test/libevmasm/Optimiser.cpp | 4 ++-- .../semanticTests/array/reusing_memory.sol | 2 +- .../constructor/arrays_in_constructors.sol | 2 +- .../bytes_in_constructors_packer.sol | 2 +- .../creation_function_call_with_args.sol | 2 +- .../creation_function_call_with_salt.sol | 2 +- .../inheritance/value_for_constructor.sol | 2 +- .../salted_create_with_value.sol | 2 +- test/libyul/EVMCodeTransformTest.cpp | 2 +- test/tools/fuzzer_common.cpp | 24 ++++++++++--------- 23 files changed, 62 insertions(+), 47 deletions(-) diff --git a/Changelog.md b/Changelog.md index 181c386aa..63588731f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ Compiler Features: * JSON-AST: Added selector field for errors and events. Bugfixes: + * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``. ### 0.8.12 (2022-02-16) diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index 55d23e283..492d434c8 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -411,13 +411,15 @@ map const& Assembly::optimiseInternal( if (m_tagReplacements) return *m_tagReplacements; + assertThrow(_settings.isCreation == m_creation, OptimizerException, "Mismatching creation settings."); + // Run optimisation for sub-assemblies. for (size_t subId = 0; subId < m_subs.size(); ++subId) { OptimiserSettings settings = _settings; - // Disable creation mode for sub-assemblies. - settings.isCreation = false; - map const& subTagReplacements = m_subs[subId]->optimiseInternal( + Assembly& sub = *m_subs[subId]; + settings.isCreation = sub.isCreation(); + map const& subTagReplacements = sub.optimiseInternal( settings, JumpdestRemover::referencedTags(m_items, subId) ); diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h index 97807e223..270d85480 100644 --- a/libevmasm/Assembly.h +++ b/libevmasm/Assembly.h @@ -48,7 +48,7 @@ using AssemblyPointer = std::shared_ptr; class Assembly { public: - explicit Assembly(std::string _name = std::string()):m_name(std::move(_name)) { } + Assembly(bool _creation, std::string _name): m_creation(_creation), m_name(std::move(_name)) { } AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); } AssemblyItem newPushTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(PushTag, m_usedTags++); } @@ -157,6 +157,8 @@ public: std::vector decodeSubPath(size_t _subObjectId) const; size_t encodeSubPath(std::vector const& _subPath); + bool isCreation() const { return m_creation; } + protected: /// Does the same operations as @a optimise, but should only be applied to a sub and /// returns the replaced tags. Also takes an argument containing the tags of this assembly @@ -214,6 +216,8 @@ protected: mutable std::vector m_tagPositionsInBytecode; int m_deposit = 0; + /// True, if the assembly contains contract creation code. + bool const m_creation = false; /// Internal name of the assembly object, only used with the Yul backend /// currently std::string m_name; diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h index cd71d5a4d..a796ac60b 100644 --- a/libsolidity/codegen/CompilerContext.h +++ b/libsolidity/codegen/CompilerContext.h @@ -65,7 +65,7 @@ public: RevertStrings _revertStrings, CompilerContext* _runtimeContext = nullptr ): - m_asm(std::make_shared()), + m_asm(std::make_shared(_runtimeContext != nullptr, std::string{})), m_evmVersion(_evmVersion), m_revertStrings(_revertStrings), m_reservedMemory{0}, diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp index 30ad58d77..5d0ddd81a 100644 --- a/libyul/AssemblyStack.cpp +++ b/libyul/AssemblyStack.cpp @@ -38,6 +38,7 @@ #include #include +#include #include using namespace std; @@ -194,7 +195,10 @@ void AssemblyStack::optimize(Object& _object, bool _isCreation) yulAssert(_object.analysisInfo, ""); for (auto& subNode: _object.subObjects) if (auto subObject = dynamic_cast(subNode.get())) - optimize(*subObject, false); + { + bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed"); + optimize(*subObject, isCreation); + } Dialect const& dialect = languageToDialect(m_language, m_evmVersion); unique_ptr meter; @@ -281,7 +285,7 @@ AssemblyStack::assembleEVMWithDeployed(optional _deployName) const yulAssert(m_parserResult->code, ""); yulAssert(m_parserResult->analysisInfo, ""); - evmasm::Assembly assembly; + evmasm::Assembly assembly(true, {}); EthAssemblyAdapter adapter(assembly); compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation); diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h index 66d5333e2..2d7be9001 100644 --- a/libyul/backends/evm/AbstractAssembly.h +++ b/libyul/backends/evm/AbstractAssembly.h @@ -98,7 +98,7 @@ public: /// Append the assembled size as a constant. virtual void appendAssemblySize() = 0; /// Creates a new sub-assembly, which can be referenced using dataSize and dataOffset. - virtual std::pair, SubID> createSubAssembly(std::string _name = "") = 0; + virtual std::pair, SubID> createSubAssembly(bool _creation, std::string _name = "") = 0; /// Appends the offset of the given sub-assembly or data. virtual void appendDataOffset(std::vector const& _subPath) = 0; /// Appends the size of the given sub-assembly or data. diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp index c3c95d8bc..b60e383e6 100644 --- a/libyul/backends/evm/EVMObjectCompiler.cpp +++ b/libyul/backends/evm/EVMObjectCompiler.cpp @@ -30,6 +30,8 @@ #include #include +#include + using namespace solidity::yul; using namespace std; @@ -48,7 +50,8 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize) for (auto const& subNode: _object.subObjects) if (auto* subObject = dynamic_cast(subNode.get())) { - auto subAssemblyAndID = m_assembly.createSubAssembly(subObject->name.str()); + bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed"); + auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name.str()); context.subIDs[subObject->name] = subAssemblyAndID.second; subObject->subId = subAssemblyAndID.second; compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize); diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp index 1c41534b2..5d7b4cbf4 100644 --- a/libyul/backends/evm/EthAssemblyAdapter.cpp +++ b/libyul/backends/evm/EthAssemblyAdapter.cpp @@ -122,9 +122,9 @@ void EthAssemblyAdapter::appendAssemblySize() m_assembly.appendProgramSize(); } -pair, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(string _name) +pair, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, string _name) { - shared_ptr assembly{make_shared(std::move(_name))}; + shared_ptr assembly{make_shared(_creation, std::move(_name))}; auto sub = m_assembly.newSub(assembly); return {make_shared(*assembly), static_cast(sub.data())}; } diff --git a/libyul/backends/evm/EthAssemblyAdapter.h b/libyul/backends/evm/EthAssemblyAdapter.h index c11b375f6..87047ccbf 100644 --- a/libyul/backends/evm/EthAssemblyAdapter.h +++ b/libyul/backends/evm/EthAssemblyAdapter.h @@ -55,7 +55,7 @@ public: void appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType) override; void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override; void appendAssemblySize() override; - std::pair, SubID> createSubAssembly(std::string _name = {}) override; + std::pair, SubID> createSubAssembly(bool _creation, std::string _name = {}) override; void appendDataOffset(std::vector const& _subPath) override; void appendDataSize(std::vector const& _subPath) override; SubID appendData(bytes const& _data) override; diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp index 62c0ad119..e26204201 100644 --- a/libyul/backends/evm/NoOutputAssembly.cpp +++ b/libyul/backends/evm/NoOutputAssembly.cpp @@ -98,7 +98,7 @@ void NoOutputAssembly::appendAssemblySize() appendInstruction(evmasm::Instruction::PUSH1); } -pair, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(std::string) +pair, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(bool, std::string) { yulAssert(false, "Sub assemblies not implemented."); return {}; diff --git a/libyul/backends/evm/NoOutputAssembly.h b/libyul/backends/evm/NoOutputAssembly.h index b41d7f4a6..1103392ef 100644 --- a/libyul/backends/evm/NoOutputAssembly.h +++ b/libyul/backends/evm/NoOutputAssembly.h @@ -65,7 +65,7 @@ public: void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override; void appendAssemblySize() override; - std::pair, SubID> createSubAssembly(std::string _name = "") override; + std::pair, SubID> createSubAssembly(bool _creation, std::string _name = "") override; void appendDataOffset(std::vector const& _subPath) override; void appendDataSize(std::vector const& _subPath) override; SubID appendData(bytes const& _data) override; diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output index b95184440..357c796ee 100644 --- a/test/cmdlineTests/yul_optimize_runs/output +++ b/test/cmdlineTests/yul_optimize_runs/output @@ -21,7 +21,7 @@ object "RunsTest1" { Binary representation: -602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500 +600c80600c6000396000f3fe63abc1234560e01b60005500 Text representation: /* "yul_optimize_runs/input.yul":106:125 */ @@ -40,8 +40,7 @@ Text representation: stop sub_0: assembly { - /* "yul_optimize_runs/input.yul":237:257 */ - 0xabc1234500000000000000000000000000000000000000000000000000000000 + shl(0xe0, 0xabc12345) /* "yul_optimize_runs/input.yul":277:278 */ 0x00 /* "yul_optimize_runs/input.yul":270:288 */ diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp index 78e598bca..3a3167816 100644 --- a/test/libevmasm/Assembler.cpp +++ b/test/libevmasm/Assembler.cpp @@ -58,11 +58,11 @@ BOOST_AUTO_TEST_CASE(all_assembly_items) { "root.asm", 0 }, { "sub.asm", 1 } }; - Assembly _assembly; + Assembly _assembly{false, {}}; auto root_asm = make_shared("root.asm"); _assembly.setSourceLocation({1, 3, root_asm}); - Assembly _subAsm; + Assembly _subAsm{false, {}}; auto sub_asm = make_shared("sub.asm"); _subAsm.setSourceLocation({6, 8, sub_asm}); // PushImmutable @@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps) { *subName, 1 } }; - auto subAsm = make_shared(); + auto subAsm = make_shared(false, string{}); for (char i = 0; i < numImmutables; ++i) { for (int r = 0; r < numActualRefs; ++r) @@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps) } } - Assembly assembly; + Assembly assembly{true, {}}; for (char i = 1; i <= numImmutables; ++i) { assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName}); @@ -256,11 +256,11 @@ BOOST_AUTO_TEST_CASE(immutable) { "root.asm", 0 }, { "sub.asm", 1 } }; - Assembly _assembly; + Assembly _assembly{true, {}}; auto root_asm = make_shared("root.asm"); _assembly.setSourceLocation({1, 3, root_asm}); - Assembly _subAsm; + Assembly _subAsm{false, {}}; auto sub_asm = make_shared("sub.asm"); _subAsm.setSourceLocation({6, 8, sub_asm}); _subAsm.appendImmutable("someImmutable"); @@ -349,10 +349,10 @@ BOOST_AUTO_TEST_CASE(immutable) BOOST_AUTO_TEST_CASE(subobject_encode_decode) { - Assembly assembly; + Assembly assembly{true, {}}; - shared_ptr subAsmPtr = make_shared(); - shared_ptr subSubAsmPtr = make_shared(); + shared_ptr subAsmPtr = make_shared(false, string{}); + shared_ptr subSubAsmPtr = make_shared(false, string{}); assembly.appendSubroutine(subAsmPtr); subAsmPtr->appendSubroutine(subSubAsmPtr); diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp index c8bb93c41..278a7c77f 100644 --- a/test/libevmasm/Optimiser.cpp +++ b/test/libevmasm/Optimiser.cpp @@ -1250,8 +1250,8 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies) // tag unifications (due to block deduplication) is also // visible at the super-assembly. - Assembly main; - AssemblyPointer sub = make_shared(); + Assembly main{false, {}}; + AssemblyPointer sub = make_shared(true, string{}); sub->append(u256(1)); auto t1 = sub->newTag(); diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol index ee91ce7f7..ba0ca8abd 100644 --- a/test/libsolidity/semanticTests/array/reusing_memory.sol +++ b/test/libsolidity/semanticTests/array/reusing_memory.sol @@ -26,6 +26,6 @@ contract Main { // compileViaYul: also // ---- // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1 -// gas irOptimized: 113598 +// gas irOptimized: 113610 // gas legacy: 126596 // gas legacyOptimized: 113823 diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol index cc303899a..21de2ac97 100644 --- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol +++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8 -// gas irOptimized: 443960 +// gas irOptimized: 444029 // gas legacy: 590683 // gas legacyOptimized: 448326 diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol index ffe0fb8c2..d5e633924 100644 --- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol +++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h" -// gas irOptimized: 300804 +// gas irOptimized: 300885 // gas legacy: 428917 // gas legacyOptimized: 298128 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol index 685d8a7de..c4a65bb55 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol @@ -17,7 +17,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 203967 +// gas irOptimized: 203963 // gas legacy: 245842 // gas legacyOptimized: 195676 // f() -> 2 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol index a768a2836..7ed638418 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol @@ -18,7 +18,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 204130 +// gas irOptimized: 204126 // gas legacy: 246202 // gas legacyOptimized: 195914 // f() -> 2 diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol index e6f94bdcf..462de46a7 100644 --- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol +++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol @@ -42,7 +42,7 @@ contract Main { // compileViaYul: also // ---- // constructor(), 22 wei -> -// gas irOptimized: 284287 +// gas irOptimized: 284283 // gas legacy: 402045 // gas legacyOptimized: 266772 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol index 4ce8b5149..eb9d93ee2 100644 --- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol +++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol @@ -22,6 +22,6 @@ contract A { // compileViaYul: also // ---- // f(), 10 ether -> 3007, 3008, 3009 -// gas irOptimized: 272413 +// gas irOptimized: 272449 // gas legacy: 422501 // gas legacyOptimized: 287472 diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp index 8986acc1b..679493f35 100644 --- a/test/libyul/EVMCodeTransformTest.cpp +++ b/test/libyul/EVMCodeTransformTest.cpp @@ -65,7 +65,7 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _ return TestResult::FatalError; } - evmasm::Assembly assembly; + evmasm::Assembly assembly{false, {}}; EthAssemblyAdapter adapter(assembly); EVMObjectCompiler::compile( *stack.parserResult(), diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp index 82066bf52..094a84554 100644 --- a/test/tools/fuzzer_common.cpp +++ b/test/tools/fuzzer_common.cpp @@ -185,25 +185,27 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet) if (!_quiet) cout << "Got " << numbers.size() << " inputs:" << endl; - Assembly assembly; - for (u256 const& n: numbers) - { - if (!_quiet) - cout << n << endl; - assembly.append(n); - } for (bool isCreation: {false, true}) + { + Assembly assembly{isCreation, {}}; + for (u256 const& n: numbers) + { + if (!_quiet) + cout << n << endl; + assembly.append(n); + } for (unsigned runs: {1u, 2u, 3u, 20u, 40u, 100u, 200u, 400u, 1000u}) { // Make a copy here so that each time we start with the original state. Assembly tmp = assembly; ConstantOptimisationMethod::optimiseConstants( - isCreation, - runs, - langutil::EVMVersion{}, - tmp + isCreation, + runs, + langutil::EVMVersion{}, + tmp ); } + } } void FuzzerUtil::testStandardCompiler(string const& _input, bool _quiet) From 0a9d752b8b9bd033a0a302ffe68b0c7e516cafe7 Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Mon, 7 Mar 2022 13:06:58 +0100 Subject: [PATCH 09/58] Add test case and adjust tests. --- .../viair_subobject_optimization/args | 1 + .../viair_subobject_optimization/input.sol | 20 + .../viair_subobject_optimization/output | 379 ++++++++++++++++++ test/cmdlineTests/yul_optimize_runs/input.yul | 6 +- test/cmdlineTests/yul_optimize_runs/output | 25 +- .../semanticTests/array/reusing_memory.sol | 2 +- .../constructor/arrays_in_constructors.sol | 2 +- .../bytes_in_constructors_packer.sol | 2 +- .../creation_function_call_with_args.sol | 2 +- .../creation_function_call_with_salt.sol | 2 +- .../inheritance/value_for_constructor.sol | 2 +- .../salted_create_with_value.sol | 2 +- 12 files changed, 423 insertions(+), 22 deletions(-) create mode 100644 test/cmdlineTests/viair_subobject_optimization/args create mode 100644 test/cmdlineTests/viair_subobject_optimization/input.sol create mode 100644 test/cmdlineTests/viair_subobject_optimization/output diff --git a/test/cmdlineTests/viair_subobject_optimization/args b/test/cmdlineTests/viair_subobject_optimization/args new file mode 100644 index 000000000..51e6fa519 --- /dev/null +++ b/test/cmdlineTests/viair_subobject_optimization/args @@ -0,0 +1 @@ +--experimental-via-ir --optimize --asm \ No newline at end of file diff --git a/test/cmdlineTests/viair_subobject_optimization/input.sol b/test/cmdlineTests/viair_subobject_optimization/input.sol new file mode 100644 index 000000000..74549134a --- /dev/null +++ b/test/cmdlineTests/viair_subobject_optimization/input.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-3.0 +pragma solidity >0.0.0; + +contract C { + constructor(uint x) { + // In earlier versions of the compiler, the resulting assembly pushed the constant + // 0xFFFFFFFFFFFFFFFF42 directly in the subassembly of D, while it was optimized to + // ``sub(shl(0x48, 0x01), 0xbe)`` when C was compiled in isolation. + // Now the assembly is expected to contain two instances of ``sub(shl(0x48, 0x01), 0xbe)``, + // one in the creation code of ``C`` directly, one in a subassembly of ``D``. + // The constant 0xFFFFFFFFFFFFFFFF42 should not occur in the assembly output at all. + if (x == 0xFFFFFFFFFFFFFFFF42) + revert(); + } +} +contract D { + function f() public pure returns (bytes memory) { + return type(C).creationCode; + } +} diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output new file mode 100644 index 000000000..8b5666b37 --- /dev/null +++ b/test/cmdlineTests/viair_subobject_optimization/output @@ -0,0 +1,379 @@ + +======= viair_subobject_optimization/input.sol:C ======= +EVM assembly: + /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ + 0x80 + dup1 + 0x40 + mstore + jumpi(tag_6, callvalue) + 0x1f + bytecodeSize + codesize + dup2 + swap1 + sub + swap2 + dup3 + add + not(0x1f) + and + dup4 + add + swap2 + sub(shl(0x40, 0x01), 0x01) + dup4 + gt + dup5 + dup5 + lt + or + tag_4 + jumpi + dup1 + dup5 + swap3 + 0x20 + swap5 + 0x40 + mstore + dup4 + codecopy + dup2 + add + sub + slt + tag_6 + jumpi + tag_8 + swap1 + mload + tag_1 + jump // in +tag_8: + mload(0x40) + dataSize(sub_0) + swap1 + dup2 + dataOffset(sub_0) + dup3 + codecopy + return +tag_6: + pop + 0x00 + dup1 + revert +tag_4: + pop + pop + pop + pop + mstore(0x00, shl(0xe0, 0x4e487b71)) + mstore(0x04, 0x41) + revert(0x00, 0x24) + /* "viair_subobject_optimization/input.sol":76:666 constructor(uint x) {... */ +tag_1: + sub(shl(0x48, 0x01), 0xbe) + /* "viair_subobject_optimization/input.sol":620:645 x == 0xFFFFFFFFFFFFFFFF42 */ + eq + /* "viair_subobject_optimization/input.sol":616:661 if (x == 0xFFFFFFFFFFFFFFFF42)... */ + tag_6 + jumpi + /* "viair_subobject_optimization/input.sol":76:666 constructor(uint x) {... */ + jump // out +stop + +sub_0: assembly { + /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ + mstore(0x40, 0x80) + 0x00 + dup1 + revert + + auxdata: +} + + +======= viair_subobject_optimization/input.sol:D ======= +EVM assembly: + /* "viair_subobject_optimization/input.sol":669:772 contract D {... */ + 0x80 + dup1 + 0x40 + mstore + jumpi(tag_1, callvalue) + dataSize(sub_0) + swap1 + dup2 + dataOffset(sub_0) + dup3 + codecopy + return +tag_1: + pop + 0x00 + dup1 + revert +stop + +sub_0: assembly { + /* "viair_subobject_optimization/input.sol":669:772 contract D {... */ + 0x80 + dup1 + 0x40 + mstore + jumpi(tag_2, iszero(lt(calldatasize, 0x04))) + tag_3: + pop + 0x00 + dup1 + revert + tag_2: + 0x00 + swap1 + dup2 + calldataload + 0xe0 + shr + 0x26121ff0 + eq + tag_4 + jumpi + pop + jump(tag_3) + tag_4: + jumpi(tag_8, callvalue) + dup2 + add(calldatasize, not(0x03)) + slt + tag_8 + jumpi + /* "viair_subobject_optimization/input.sol":745:765 type(C).creationCode */ + dataSize(sub_0) + /* "viair_subobject_optimization/input.sol":669:772 contract D {... */ + 0x3f + dup2 + add + not(0x1f) + and + dup3 + add + 0xffffffffffffffff + dup2 + gt + dup4 + dup3 + lt + or + tag_10 + jumpi + tag_12 + swap4 + pop + 0x40 + mstore + /* "viair_subobject_optimization/input.sol":745:765 type(C).creationCode */ + dup1 + dup3 + mstore + dataOffset(sub_0) + 0x20 + dup4 + add + codecopy + /* "viair_subobject_optimization/input.sol":669:772 contract D {... */ + mload(0x40) + swap2 + dup3 + swap2 + dup3 + tag_1 + jump // in + tag_12: + sub + swap1 + return + tag_10: + pop + pop + shl(0xe0, 0x4e487b71) + dup3 + mstore + pop + mstore(0x04, 0x41) + 0x24 + swap1 + revert + tag_8: + pop + dup1 + revert + tag_1: + swap2 + swap1 + swap2 + 0x20 + dup1 + dup3 + mstore + dup4 + mload + swap1 + dup2 + dup2 + dup5 + add + mstore + 0x00 + swap5 + tag_13: + dup3 + dup7 + lt + tag_14 + jumpi + pop + pop + dup1 + 0x40 + swap4 + swap5 + gt + tag_16 + jumpi + tag_17: + 0x1f + add + not(0x1f) + and + add + add + swap1 + jump // out + tag_16: + 0x00 + dup4 + dup3 + dup5 + add + add + mstore + jump(tag_17) + tag_14: + dup6 + dup2 + add + dup3 + add + mload + dup5 + dup8 + add + 0x40 + add + mstore + swap5 + dup2 + add + swap5 + jump(tag_13) + stop + + sub_0: assembly { + /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ + 0x80 + dup1 + 0x40 + mstore + jumpi(tag_6, callvalue) + 0x1f + bytecodeSize + codesize + dup2 + swap1 + sub + swap2 + dup3 + add + not(0x1f) + and + dup4 + add + swap2 + sub(shl(0x40, 0x01), 0x01) + dup4 + gt + dup5 + dup5 + lt + or + tag_4 + jumpi + dup1 + dup5 + swap3 + 0x20 + swap5 + 0x40 + mstore + dup4 + codecopy + dup2 + add + sub + slt + tag_6 + jumpi + tag_8 + swap1 + mload + tag_1 + jump // in + tag_8: + mload(0x40) + dataSize(sub_0) + swap1 + dup2 + dataOffset(sub_0) + dup3 + codecopy + return + tag_6: + pop + 0x00 + dup1 + revert + tag_4: + pop + pop + pop + pop + mstore(0x00, shl(0xe0, 0x4e487b71)) + mstore(0x04, 0x41) + revert(0x00, 0x24) + /* "viair_subobject_optimization/input.sol":76:666 constructor(uint x) {... */ + tag_1: + sub(shl(0x48, 0x01), 0xbe) + /* "viair_subobject_optimization/input.sol":620:645 x == 0xFFFFFFFFFFFFFFFF42 */ + eq + /* "viair_subobject_optimization/input.sol":616:661 if (x == 0xFFFFFFFFFFFFFFFF42)... */ + tag_6 + jumpi + /* "viair_subobject_optimization/input.sol":76:666 constructor(uint x) {... */ + jump // out + stop + + sub_0: assembly { + /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ + mstore(0x40, 0x80) + 0x00 + dup1 + revert + + auxdata: + } + } + + auxdata: +} diff --git a/test/cmdlineTests/yul_optimize_runs/input.yul b/test/cmdlineTests/yul_optimize_runs/input.yul index 07c602a4a..6088853e6 100644 --- a/test/cmdlineTests/yul_optimize_runs/input.yul +++ b/test/cmdlineTests/yul_optimize_runs/input.yul @@ -1,10 +1,10 @@ object "RunsTest1" { code { // Deploy the contract - datacopy(0, dataoffset("Runtime"), datasize("Runtime")) - return(0, datasize("Runtime")) + datacopy(0, dataoffset("Runtime_deployed"), datasize("Runtime_deployed")) + return(0, datasize("Runtime_deployed")) } - object "Runtime" { + object "Runtime_deployed" { code { let funcSel := shl(224, 0xabc12345) sstore(0, funcSel) diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output index 357c796ee..6f4ba8390 100644 --- a/test/cmdlineTests/yul_optimize_runs/output +++ b/test/cmdlineTests/yul_optimize_runs/output @@ -5,12 +5,12 @@ Pretty printed source: object "RunsTest1" { code { { - let _1 := datasize("Runtime") - datacopy(0, dataoffset("Runtime"), _1) + let _1 := datasize("Runtime_deployed") + datacopy(0, dataoffset("Runtime_deployed"), _1) return(0, _1) } } - object "Runtime" { + object "Runtime_deployed" { code { { sstore(0, 0xabc1234500000000000000000000000000000000000000000000000000000000) @@ -21,30 +21,31 @@ object "RunsTest1" { Binary representation: -600c80600c6000396000f3fe63abc1234560e01b60005500 +602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500 Text representation: - /* "yul_optimize_runs/input.yul":106:125 */ + /* "yul_optimize_runs/input.yul":115:143 */ dataSize(sub_0) - /* "yul_optimize_runs/input.yul":83:104 */ + /* "yul_optimize_runs/input.yul":83:113 */ dup1 dataOffset(sub_0) /* "yul_optimize_runs/input.yul":80:81 */ 0x00 - /* "yul_optimize_runs/input.yul":71:126 */ + /* "yul_optimize_runs/input.yul":71:144 */ codecopy /* "yul_optimize_runs/input.yul":80:81 */ 0x00 - /* "yul_optimize_runs/input.yul":135:165 */ + /* "yul_optimize_runs/input.yul":153:192 */ return stop sub_0: assembly { - shl(0xe0, 0xabc12345) - /* "yul_optimize_runs/input.yul":277:278 */ + /* "yul_optimize_runs/input.yul":273:293 */ + 0xabc1234500000000000000000000000000000000000000000000000000000000 + /* "yul_optimize_runs/input.yul":313:314 */ 0x00 - /* "yul_optimize_runs/input.yul":270:288 */ + /* "yul_optimize_runs/input.yul":306:324 */ sstore - /* "yul_optimize_runs/input.yul":208:298 */ + /* "yul_optimize_runs/input.yul":244:334 */ stop } diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol index ba0ca8abd..7a05b5328 100644 --- a/test/libsolidity/semanticTests/array/reusing_memory.sol +++ b/test/libsolidity/semanticTests/array/reusing_memory.sol @@ -26,6 +26,6 @@ contract Main { // compileViaYul: also // ---- // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1 -// gas irOptimized: 113610 +// gas irOptimized: 113613 // gas legacy: 126596 // gas legacyOptimized: 113823 diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol index 21de2ac97..031deb64c 100644 --- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol +++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8 -// gas irOptimized: 444029 +// gas irOptimized: 443989 // gas legacy: 590683 // gas legacyOptimized: 448326 diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol index d5e633924..8264a93ed 100644 --- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol +++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h" -// gas irOptimized: 300885 +// gas irOptimized: 300837 // gas legacy: 428917 // gas legacyOptimized: 298128 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol index c4a65bb55..0b9407814 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol @@ -17,7 +17,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 203963 +// gas irOptimized: 203982 // gas legacy: 245842 // gas legacyOptimized: 195676 // f() -> 2 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol index 7ed638418..a4796ac82 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol @@ -18,7 +18,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 204126 +// gas irOptimized: 204145 // gas legacy: 246202 // gas legacyOptimized: 195914 // f() -> 2 diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol index 462de46a7..aea318e65 100644 --- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol +++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol @@ -42,7 +42,7 @@ contract Main { // compileViaYul: also // ---- // constructor(), 22 wei -> -// gas irOptimized: 284283 +// gas irOptimized: 284321 // gas legacy: 402045 // gas legacyOptimized: 266772 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol index eb9d93ee2..780cc32b8 100644 --- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol +++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol @@ -22,6 +22,6 @@ contract A { // compileViaYul: also // ---- // f(), 10 ether -> 3007, 3008, 3009 -// gas irOptimized: 272449 +// gas irOptimized: 272467 // gas legacy: 422501 // gas legacyOptimized: 287472 From b57e8564267d0aefdb8e9a71f89ccbf4dbbabd0c Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Mon, 7 Mar 2022 16:24:20 +0100 Subject: [PATCH 10/58] Adjust documentation. --- docs/yul.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/yul.rst b/docs/yul.rst index e4775ee4d..8a584db1d 100644 --- a/docs/yul.rst +++ b/docs/yul.rst @@ -1124,6 +1124,11 @@ regular strings in native encoding. For code, Above, ``Block`` refers to ``Block`` in the Yul code grammar explained in the previous chapter. +.. note:: + + An object with a name that ends in ``_deployed`` is treated as deployed code by the Yul optimizer. + The only consequence of this is a different gas cost heuristic in the optimizer. + .. note:: Data objects or sub-objects whose names contain a ``.`` can be defined @@ -1172,17 +1177,17 @@ An example Yul Object is shown below: // now return the runtime object (the currently // executing code is the constructor code) - size := datasize("runtime") + size := datasize("Contract1_deployed") offset := allocate(size) // This will turn into a memory->memory copy for Ewasm and // a codecopy for EVM - datacopy(offset, dataoffset("runtime"), size) + datacopy(offset, dataoffset("Contract1_deployed"), size) return(offset, size) } data "Table2" hex"4123" - object "runtime" { + object "Contract1_deployed" { code { function allocate(size) -> ptr { ptr := mload(0x40) @@ -1204,7 +1209,7 @@ An example Yul Object is shown below: // code here ... } - object "runtime" { + object "Contract2_deployed" { code { // code here ... } From e0c837b33b7c72d64572d42655f7d56769bcdefd Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Mon, 7 Mar 2022 17:39:52 +0100 Subject: [PATCH 11/58] Remove isCreation flag from OptimiserSettings. --- libevmasm/Assembly.cpp | 9 +++------ libevmasm/Assembly.h | 1 - libsolidity/codegen/CompilerContext.cpp | 3 +-- libyul/AssemblyStack.cpp | 3 +-- test/libevmasm/Optimiser.cpp | 3 +-- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index 492d434c8..6d7b97cc4 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -411,14 +411,11 @@ map const& Assembly::optimiseInternal( if (m_tagReplacements) return *m_tagReplacements; - assertThrow(_settings.isCreation == m_creation, OptimizerException, "Mismatching creation settings."); - // Run optimisation for sub-assemblies. for (size_t subId = 0; subId < m_subs.size(); ++subId) { OptimiserSettings settings = _settings; Assembly& sub = *m_subs[subId]; - settings.isCreation = sub.isCreation(); map const& subTagReplacements = sub.optimiseInternal( settings, JumpdestRemover::referencedTags(m_items, subId) @@ -438,7 +435,7 @@ map const& Assembly::optimiseInternal( m_items, _tagsReferencedFromOutside, _settings.expectedExecutionsPerDeployment, - _settings.isCreation, + isCreation(), _settings.evmVersion }.optimise(); @@ -539,8 +536,8 @@ map const& Assembly::optimiseInternal( if (_settings.runConstantOptimiser) ConstantOptimisationMethod::optimiseConstants( - _settings.isCreation, - _settings.isCreation ? 1 : _settings.expectedExecutionsPerDeployment, + isCreation(), + isCreation() ? 1 : _settings.expectedExecutionsPerDeployment, _settings.evmVersion, *this ); diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h index 270d85480..11bc16662 100644 --- a/libevmasm/Assembly.h +++ b/libevmasm/Assembly.h @@ -117,7 +117,6 @@ public: struct OptimiserSettings { - bool isCreation = false; bool runInliner = false; bool runJumpdestRemover = false; bool runPeephole = false; diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 700f53d1f..a01dafc91 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -572,8 +572,7 @@ void CompilerContext::updateSourceLocation() evmasm::Assembly::OptimiserSettings CompilerContext::translateOptimiserSettings(OptimiserSettings const& _settings) { // Constructing it this way so that we notice changes in the fields. - evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, false, m_evmVersion, 0}; - asmSettings.isCreation = true; + evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, m_evmVersion, 0}; asmSettings.runInliner = _settings.runInliner; asmSettings.runJumpdestRemover = _settings.runJumpdestRemover; asmSettings.runPeephole = _settings.runPeephole; diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp index 5d0ddd81a..3fefb9caf 100644 --- a/libyul/AssemblyStack.cpp +++ b/libyul/AssemblyStack.cpp @@ -72,8 +72,7 @@ evmasm::Assembly::OptimiserSettings translateOptimiserSettings( ) { // Constructing it this way so that we notice changes in the fields. - evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, false, _evmVersion, 0}; - asmSettings.isCreation = true; + evmasm::Assembly::OptimiserSettings asmSettings{false, false, false, false, false, false, _evmVersion, 0}; asmSettings.runInliner = _settings.runInliner; asmSettings.runJumpdestRemover = _settings.runJumpdestRemover; asmSettings.runPeephole = _settings.runPeephole; diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp index 278a7c77f..44fbde927 100644 --- a/test/libevmasm/Optimiser.cpp +++ b/test/libevmasm/Optimiser.cpp @@ -1278,7 +1278,6 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies) main.append(u256(8)); Assembly::OptimiserSettings settings; - settings.isCreation = false; settings.runInliner = false; settings.runJumpdestRemover = true; settings.runPeephole = true; @@ -1287,7 +1286,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies) settings.runConstantOptimiser = true; settings.evmVersion = solidity::test::CommonOptions::get().evmVersion(); settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment; -; + main.optimise(settings); AssemblyItems expectationMain{ From e7a3814977c0ba0715e910068e5a0430e3b90770 Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Wed, 9 Mar 2022 16:52:30 +0100 Subject: [PATCH 12/58] Unit test. --- test/libsolidity/SolidityEndToEndTest.cpp | 28 +++++++++++++++++++ .../SolidityExecutionFramework.cpp | 1 + test/libsolidity/SolidityExecutionFramework.h | 5 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 314d4283e..5a76a16c6 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -84,6 +84,34 @@ struct SolidityEndToEndTestExecutionFramework: public SolidityExecutionFramework BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityEndToEndTestExecutionFramework) +BOOST_AUTO_TEST_CASE(creation_code_optimizer) +{ + string codeC = R"( + contract C { + constructor(uint x) { + if (x == 0xFFFFFFFFFFFFFFFF42) + revert(); + } + } + )"; + string codeD = R"( + contract D { + function f() public pure returns (bytes memory) { + return type(C).creationCode; + } + } + )"; + + m_metadataHash = CompilerStack::MetadataHash::None; + ALSO_VIA_YUL({ + bytes bytecodeC = compileContract(codeC); + reset(); + compileAndRun(codeC + codeD); + ABI_CHECK(callContractFunction("f()"), encodeArgs(0x20, bytecodeC.size()) + encode(bytecodeC, false)); + m_doEwasmTestrun = false; + }) +} + unsigned constexpr roundTo32(unsigned _num) { return (_num + 31) / 32 * 32; diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp index f3921613f..7ff226a69 100644 --- a/test/libsolidity/SolidityExecutionFramework.cpp +++ b/test/libsolidity/SolidityExecutionFramework.cpp @@ -62,6 +62,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract( m_compiler.enableEvmBytecodeGeneration(!m_compileViaYul); m_compiler.enableIRGeneration(m_compileViaYul); m_compiler.setRevertStringBehaviour(m_revertStrings); + m_compiler.setMetadataHash(m_metadataHash); if (!m_compiler.compile()) { // The testing framework expects an exception for diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index e0e02cf95..202addffa 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -75,11 +75,12 @@ public: /// the latter only if it is forced. static std::string addPreamble(std::string const& _sourceCode); protected: - - solidity::frontend::CompilerStack m_compiler; + using CompilerStack = solidity::frontend::CompilerStack; + CompilerStack m_compiler; bool m_compileViaYul = false; bool m_compileToEwasm = false; bool m_showMetadata = false; + CompilerStack::MetadataHash m_metadataHash = CompilerStack::MetadataHash::IPFS; RevertStrings m_revertStrings = RevertStrings::Default; }; From 1b93db7863209dab8850a96bdb262cdbca688d85 Mon Sep 17 00:00:00 2001 From: kanedaaaa Date: Wed, 9 Mar 2022 18:35:14 +0100 Subject: [PATCH 13/58] doc: improve explanation of interfaces --- docs/contracts/interfaces.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/contracts/interfaces.rst b/docs/contracts/interfaces.rst index a4581a15f..cc71cf64e 100644 --- a/docs/contracts/interfaces.rst +++ b/docs/contracts/interfaces.rst @@ -10,7 +10,7 @@ Interfaces are similar to abstract contracts, but they cannot have any functions There are further restrictions: - They cannot inherit from other contracts, but they can inherit from other interfaces. -- All declared functions must be external. +- All declared functions must be external in the interface, even if they are public in the contract. - They cannot declare a constructor. - They cannot declare state variables. - They cannot declare modifiers. From 68bdb7f2e03a79739c8bef7dceb1a65dc6a8d0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Mon, 28 Feb 2022 14:23:25 +0100 Subject: [PATCH 14/58] Disable flaky ElementFi tests --- test/externalTests/elementfi.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh index 37d5b7410..d8d3fd6cb 100755 --- a/test/externalTests/elementfi.sh +++ b/test/externalTests/elementfi.sh @@ -89,6 +89,12 @@ function elementfi_test # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed. sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol + # This test file is very flaky. There's one particular cases that fails randomly (see + # https://github.com/element-fi/elf-contracts/issues/240) but some others also depends on an external + # service which makes tests time out when that service is down. + # "ProviderError: Too Many Requests error received from eth-mainnet.alchemyapi.io" + rm test/mockERC20YearnVaultTest.ts + # Several tests fail unless we use the exact versions hard-coded in package-lock.json #neutralize_package_lock From 304c3984adc8e1b615dd7bd2626331e680b876ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Tue, 26 Oct 2021 11:12:45 +0200 Subject: [PATCH 15/58] Update gnosis external test to use upstream directly and use Hardhat --- .circleci/config.yml | 20 ++------ test/externalTests.sh | 1 - test/externalTests/gnosis-v2.sh | 81 --------------------------------- test/externalTests/gnosis.sh | 38 ++++++++++------ 4 files changed, 29 insertions(+), 111 deletions(-) delete mode 100755 test/externalTests/gnosis-v2.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 65e7113a3..f7f2de8cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -513,19 +513,12 @@ defaults: nodejs_version: '14' - job_native_test_ext_gnosis: &job_native_test_ext_gnosis - <<: *workflow_emscripten + <<: *workflow_ubuntu2004_static name: t_native_test_ext_gnosis project: gnosis binary_type: native - # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1"). - nodejs_version: '12' - - job_native_test_ext_gnosis_v2: &job_native_test_ext_gnosis_v2 - <<: *workflow_ubuntu2004_static - name: t_native_test_ext_gnosis_v2 - project: gnosis-v2 - binary_type: native - # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1"). - nodejs_version: '12' + # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported" + nodejs_version: '16' - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin <<: *workflow_ubuntu2004_static name: t_native_test_ext_zeppelin @@ -1468,10 +1461,7 @@ workflows: - t_ems_ext: *job_ems_compile_ext_colony - t_ems_ext: *job_native_compile_ext_gnosis - # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError - # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216. - #-t_ems_ext: *job_native_test_ext_gnosis - - t_ems_ext: *job_native_test_ext_gnosis_v2 + - t_ems_ext: *job_native_test_ext_gnosis - t_ems_ext: *job_native_test_ext_zeppelin - t_ems_ext: *job_native_test_ext_ens - t_ems_ext: *job_native_test_ext_trident @@ -1489,7 +1479,7 @@ workflows: requires: - t_ems_compile_ext_colony - t_native_compile_ext_gnosis - - t_native_test_ext_gnosis_v2 + - t_native_test_ext_gnosis - t_native_test_ext_zeppelin - t_native_test_ext_ens - t_native_test_ext_trident diff --git a/test/externalTests.sh b/test/externalTests.sh index b3b46460b..2c4c6f76c 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -39,7 +39,6 @@ printTask "Running external tests..." "{$REPO_ROOT}/test/externalTests/zeppelin.sh" "$@" "{$REPO_ROOT}/test/externalTests/gnosis.sh" "$@" -"{$REPO_ROOT}/test/externalTests/gnosis-v2.sh" "$@" "{$REPO_ROOT}/test/externalTests/colony.sh" "$@" "{$REPO_ROOT}/test/externalTests/ens.sh" "$@" "{$REPO_ROOT}/test/externalTests/trident.sh" "$@" diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh deleted file mode 100755 index 6b0915b6a..000000000 --- a/test/externalTests/gnosis-v2.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash - -# ------------------------------------------------------------------------------ -# This file is part of solidity. -# -# solidity is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# solidity is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with solidity. If not, see -# -# (c) 2020 solidity contributors. -#------------------------------------------------------------------------------ - -set -e - -source scripts/common.sh -source test/externalTests/common.sh - -REPO_ROOT=$(realpath "$(dirname "$0")/../..") - -verify_input "$@" -BINARY_TYPE="$1" -BINARY_PATH="$2" -SELECTED_PRESETS="$3" - -function compile_fn { npx truffle compile; } -function test_fn { npm test; } - -function gnosis_safe_test -{ - local repo="https://github.com/solidity-external-tests/safe-contracts.git" - local ref_type=branch - local ref="v2_080" - local config_file="truffle-config.js" - - local compile_only_presets=( - legacy-no-optimize # Compiles but migrations run out of gas: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit" - ) - local settings_presets=( - "${compile_only_presets[@]}" - #ir-no-optimize # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." - #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." - ir-optimize-evm+yul - legacy-optimize-evm-only - legacy-optimize-evm+yul - ) - - [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}") - print_presets_or_exit "$SELECTED_PRESETS" - - setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH" - download_project "$repo" "$ref_type" "$ref" "$DIR" - [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH" - - sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json - sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json - - neutralize_package_lock - neutralize_package_json_hooks - force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")" - npm install --package-lock - npm install eth-gas-reporter - - replace_version_pragmas - [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist" - - for preset in $SELECTED_PRESETS; do - truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn - store_benchmark_report truffle gnosis2 "$repo" "$preset" - done -} - -external_test Gnosis-Safe-V2 gnosis_safe_test diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh index 82d1892f2..ec09257fb 100755 --- a/test/externalTests/gnosis.sh +++ b/test/externalTests/gnosis.sh @@ -31,24 +31,26 @@ BINARY_TYPE="$1" BINARY_PATH="$2" SELECTED_PRESETS="$3" -function compile_fn { npx truffle compile; } +function compile_fn { npm run build; } function test_fn { npm test; } function gnosis_safe_test { - local repo="https://github.com/solidity-external-tests/safe-contracts.git" + local repo="https://github.com/gnosis/safe-contracts.git" local ref_type=branch - local ref="development_080" - local config_file="truffle-config.js" + local ref=main + local config_file="hardhat.config.ts" + local config_var=userConfig - local compile_only_presets=() + local compile_only_presets=( + ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115 + ) local settings_presets=( "${compile_only_presets[@]}" #ir-no-optimize # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." - ir-optimize-evm+yul - #legacy-no-optimize # Compilation fails with "Stack too deep" error - #legacy-optimize-evm-only # Compilation fails with "Stack too deep" error + legacy-no-optimize + legacy-optimize-evm-only legacy-optimize-evm+yul ) @@ -59,20 +61,28 @@ function gnosis_safe_test download_project "$repo" "$ref_type" "$ref" "$DIR" [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH" - sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json + # NOTE: The patterns below intentionally have hard-coded versions. + # When the upstream updates them, there's a chance we can just remove the regex. + sed -i 's|"@gnosis\.pm/mock-contract": "\^4\.0\.0"|"@gnosis.pm/mock-contract": "github:solidity-external-tests/mock-contract#master_080"|g' package.json + sed -i 's|"@openzeppelin/contracts": "\^3\.4\.0"|"@openzeppelin/contracts": "^4.0.0"|g' package.json + + # Disable two tests failing due to Hardhat's heuristics not yet updated to handle solc 0.8.10. + # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051). + sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts neutralize_package_lock neutralize_package_json_hooks - force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")" - npm install --package-lock - npm install eth-gas-reporter + force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" + force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" + npm install + npm install hardhat-gas-reporter replace_version_pragmas [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist" for preset in $SELECTED_PRESETS; do - truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn - store_benchmark_report truffle gnosis "$repo" "$preset" + hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var" + store_benchmark_report hardhat gnosis "$repo" "$preset" done } From 438c08248838bf14dd6b7a5b01cfeccee6b1ecae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Tue, 18 Jan 2022 15:35:35 +0100 Subject: [PATCH 16/58] CI: Remove the compile-only run for Gnosis --- .circleci/config.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f7f2de8cb..65adf9ee3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -504,13 +504,6 @@ defaults: binary_type: solcjs compile_only: 1 nodejs_version: '14' - - job_native_compile_ext_gnosis: &job_native_compile_ext_gnosis - <<: *workflow_ubuntu2004_static - name: t_native_compile_ext_gnosis - project: gnosis - binary_type: native - compile_only: 1 - nodejs_version: '14' - job_native_test_ext_gnosis: &job_native_test_ext_gnosis <<: *workflow_ubuntu2004_static @@ -1459,7 +1452,6 @@ workflows: - t_ems_ext_hardhat: *workflow_emscripten - t_ems_ext: *job_ems_compile_ext_colony - - t_ems_ext: *job_native_compile_ext_gnosis - t_ems_ext: *job_native_test_ext_gnosis - t_ems_ext: *job_native_test_ext_zeppelin @@ -1478,7 +1470,6 @@ workflows: <<: *workflow_trigger_on_tags requires: - t_ems_compile_ext_colony - - t_native_compile_ext_gnosis - t_native_test_ext_gnosis - t_native_test_ext_zeppelin - t_native_test_ext_ens From 9ef600e5726f67f802f3aa4bec2bba937d01b4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Wed, 9 Mar 2022 20:35:46 +0100 Subject: [PATCH 17/58] euler: Override Hardhat test timeout --- test/externalTests/common.sh | 24 +++++++++++++++++++++++- test/externalTests/euler.sh | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh index e4e1e3adf..9c68c8828 100644 --- a/test/externalTests/common.sh +++ b/test/externalTests/common.sh @@ -233,7 +233,6 @@ function force_truffle_compiler_settings function name_hardhat_default_export { local config_file="$1" - local config_var_name="$2" local import="import {HardhatUserConfig} from 'hardhat/types';" local config="const config: HardhatUserConfig = {" @@ -241,6 +240,29 @@ function name_hardhat_default_export echo "export default config;" >> "$config_file" } +function force_hardhat_timeout +{ + local config_file="$1" + local config_var_name="$2" + local new_timeout="$3" + + printLog "Configuring Hardhat..." + echo "-------------------------------------" + echo "Timeout: ${new_timeout}" + echo "-------------------------------------" + + if [[ $config_file == *\.js ]]; then + [[ $config_var_name == "" ]] || assertFail + echo "module.exports.mocha = module.exports.mocha || {timeout: ${new_timeout}}" + echo "module.exports.mocha.timeout = ${new_timeout}" + else + [[ $config_file == *\.ts ]] || assertFail + [[ $config_var_name != "" ]] || assertFail + echo "${config_var_name}.mocha = ${config_var_name}.mocha ?? {timeout: ${new_timeout}};" + echo "${config_var_name}.mocha!.timeout = ${new_timeout}" + fi >> "$config_file" +} + function force_hardhat_compiler_binary { local config_file="$1" diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh index b3b505051..6a73f00e5 100755 --- a/test/externalTests/euler.sh +++ b/test/externalTests/euler.sh @@ -63,6 +63,8 @@ function euler_test force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" force_hardhat_unlimited_contract_size "$config_file" + # Workaround for the timeout that's too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765) + force_hardhat_timeout "$config_file" "" 100000 npm install replace_version_pragmas From 6ab31420afab093b5d81a2caa1b7de18d2619132 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 10 Mar 2022 09:51:20 +0100 Subject: [PATCH 18/58] Remove unneeded header files. --- libyul/optimiser/StructuralSimplifier.cpp | 48 +++++++++++------------ libyul/optimiser/StructuralSimplifier.h | 4 -- test/libyul/KnowledgeBaseTest.cpp | 1 - 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp index 5b1ae2550..ca8f94239 100644 --- a/libyul/optimiser/StructuralSimplifier.cpp +++ b/libyul/optimiser/StructuralSimplifier.cpp @@ -55,6 +55,30 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const return optional>{vector{}}; } +optional hasLiteralValue(Expression const& _expression) +{ + if (holds_alternative(_expression)) + return valueOfLiteral(std::get(_expression)); + else + return std::optional(); +} + +bool expressionAlwaysTrue(Expression const& _expression) +{ + if (std::optional value = hasLiteralValue(_expression)) + return *value != 0; + else + return false; +} + +bool expressionAlwaysFalse(Expression const& _expression) +{ + if (std::optional value = hasLiteralValue(_expression)) + return *value == 0; + else + return false; +} + } void StructuralSimplifier::run(OptimiserStepContext&, Block& _ast) @@ -103,27 +127,3 @@ void StructuralSimplifier::simplify(std::vector& _statements) } ); } - -bool StructuralSimplifier::expressionAlwaysTrue(Expression const& _expression) -{ - if (std::optional value = hasLiteralValue(_expression)) - return *value != 0; - else - return false; -} - -bool StructuralSimplifier::expressionAlwaysFalse(Expression const& _expression) -{ - if (std::optional value = hasLiteralValue(_expression)) - return *value == 0; - else - return false; -} - -std::optional StructuralSimplifier::hasLiteralValue(Expression const& _expression) const -{ - if (holds_alternative(_expression)) - return valueOfLiteral(std::get(_expression)); - else - return std::optional(); -} diff --git a/libyul/optimiser/StructuralSimplifier.h b/libyul/optimiser/StructuralSimplifier.h index 3fd59efde..734b2e53a 100644 --- a/libyul/optimiser/StructuralSimplifier.h +++ b/libyul/optimiser/StructuralSimplifier.h @@ -18,7 +18,6 @@ #pragma once #include -#include #include #include @@ -50,9 +49,6 @@ private: StructuralSimplifier() = default; void simplify(std::vector& _statements); - bool expressionAlwaysTrue(Expression const& _expression); - bool expressionAlwaysFalse(Expression const& _expression); - std::optional hasLiteralValue(Expression const& _expression) const; }; } diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp index 03cc4cd8d..ac48f962f 100644 --- a/test/libyul/KnowledgeBaseTest.cpp +++ b/test/libyul/KnowledgeBaseTest.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include From e9f3f9361ddf1526be166e1f8ef2a5a535beec07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Tue, 1 Mar 2022 17:48:46 +0100 Subject: [PATCH 19/58] Re-enable running tests in external tests via IR in cases where they don't pass due to Hardhat heuristics --- test/externalTests/elementfi.sh | 12 +++++++++--- test/externalTests/gnosis.sh | 10 +++++++--- test/externalTests/prb-math.sh | 25 ++++++++++++++++++++++--- test/externalTests/zeppelin.sh | 18 +++++++++++++++--- 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh index d8d3fd6cb..74ed93a5c 100755 --- a/test/externalTests/elementfi.sh +++ b/test/externalTests/elementfi.sh @@ -42,13 +42,12 @@ function elementfi_test local config_file="hardhat.config.ts" local config_var=config - local compile_only_presets=( - ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115 - ) + local compile_only_presets=() local settings_presets=( "${compile_only_presets[@]}" #ir-no-optimize # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack." #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack." + ir-optimize-evm+yul legacy-no-optimize legacy-optimize-evm-only legacy-optimize-evm+yul @@ -89,6 +88,13 @@ function elementfi_test # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed. sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol + # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables + # them for other presets but that's fine - we want same code run for benchmarks to be comparable. + # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115). + sed -i 's|it(\("fails to withdraw more shares than in balance"\)|it.skip(\1|g' test/compoundAssetProxyTest.ts + sed -i 's|it(\("should prevent withdrawal of Principal Tokens and Interest Tokens before the tranche expires "\)|it.skip(\1|g' test/trancheTest.ts + sed -i 's|it(\("should prevent withdrawal of more Principal Tokens and Interest Tokens than the user has"\)|it.skip(\1|g' test/trancheTest.ts + # This test file is very flaky. There's one particular cases that fails randomly (see # https://github.com/element-fi/elf-contracts/issues/240) but some others also depends on an external # service which makes tests time out when that service is down. diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh index ec09257fb..ccfc6cf5c 100755 --- a/test/externalTests/gnosis.sh +++ b/test/externalTests/gnosis.sh @@ -42,13 +42,12 @@ function gnosis_safe_test local config_file="hardhat.config.ts" local config_var=userConfig - local compile_only_presets=( - ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115 - ) + local compile_only_presets=() local settings_presets=( "${compile_only_presets[@]}" #ir-no-optimize # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack." + ir-optimize-evm+yul legacy-no-optimize legacy-optimize-evm-only legacy-optimize-evm+yul @@ -70,6 +69,11 @@ function gnosis_safe_test # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051). sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts + # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables + # them for other presets but that's fine - we want same code run for benchmarks to be comparable. + # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115). + sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/GnosisSafe.Setup.spec.ts + neutralize_package_lock neutralize_package_json_hooks force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh index 01bdb76f1..1d0a0dd86 100755 --- a/test/externalTests/prb-math.sh +++ b/test/externalTests/prb-math.sh @@ -43,13 +43,12 @@ function prb_math_test local config_file="hardhat.config.ts" local config_var="config" - local compile_only_presets=( - ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115 - ) + local compile_only_presets=() local settings_presets=( "${compile_only_presets[@]}" #ir-no-optimize # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack." #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack." + ir-optimize-evm+yul legacy-optimize-evm-only legacy-optimize-evm+yul legacy-no-optimize @@ -68,6 +67,26 @@ function prb_math_test # yarn.lock. Remove the config to restore Yarn 1.x. rm .yarnrc.yml + # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables + # them for other presets but that's fine - we want same code run for benchmarks to be comparable. + # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115). + pushd test/contracts/prbMathUd60x18/pure/ + sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts + sed -i 's|context(\("when the sum does not overflow"\)|context.skip(\1|g' add.test.ts + sed -i 's|context(\("when both operands are zero"\)|context.skip(\1|g' avg.test.ts + sed -i 's|context(\("when one operand is zero and the other is not zero"\)|context.skip(\1|g' avg.test.ts + sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts + sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts + popd + pushd test/contracts/prbMathSd59x18/pure/ + sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts + sed -i 's|context(\("when the sum underflows"\)|context.skip(\1|g' add.test.ts + sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts + sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts + sed -i 's|context(\("when the difference underflows"\)|context.skip(\1|g' sub.test.ts + sed -i 's|context(\("when the difference overflows"\)|context.skip(\1|g' sub.test.ts + popd + neutralize_package_lock neutralize_package_json_hooks force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh index 4094c6936..ab79a8775 100755 --- a/test/externalTests/zeppelin.sh +++ b/test/externalTests/zeppelin.sh @@ -41,13 +41,12 @@ function zeppelin_test local ref="master" local config_file="hardhat.config.js" - local compile_only_presets=( - ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115 - ) + local compile_only_presets=() local settings_presets=( "${compile_only_presets[@]}" #ir-no-optimize # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack." #ir-optimize-evm-only # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack." + ir-optimize-evm+yul legacy-no-optimize legacy-optimize-evm-only legacy-optimize-evm+yul @@ -59,6 +58,19 @@ function zeppelin_test setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH" download_project "$repo" "$ref_type" "$ref" "$DIR" + # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables + # them for other presets but that's fine - we want same code run for benchmarks to be comparable. + # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115). + pushd test/utils/ + sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SafeMath.test.js + sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SignedSafeMath.test.js + sed -i "s|it(\('reverts \)|it.skip(\1|g" structs/EnumerableSet.behavior.js + popd + + # In some cases Hardhat does not detect revert reasons properly via IR. + # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed. + sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js + neutralize_package_json_hooks force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" From b3fe042884368e8ce4be04cb9c7693568bed570d Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 7 Mar 2022 19:13:35 +0100 Subject: [PATCH 20/58] Optimize eq iszero jumpi to xor jumpi and remove double jump. --- Changelog.md | 1 + libevmasm/PeepholeOptimiser.cpp | 61 ++++++++++++++++++- test/cmdlineTests/optimizer_user_yul/output | 5 +- .../abiEncoderV1/abi_decode_v2_storage.sol | 4 +- .../abi_encode_calldata_slice.sol | 8 +-- .../abi_encode_calldata_slice.sol | 8 +-- .../abiEncoderV2/calldata_array.sol | 4 +- .../abi_decode_simple_storage.sol | 4 +- .../arrays_complex_from_and_to_storage.sol | 2 +- .../array/byte_array_storage_layout.sol | 4 +- .../array/byte_array_transitional_2.sol | 6 +- .../array/bytes_length_member.sol | 4 +- .../copying/array_copy_calldata_storage.sol | 2 +- .../copying/array_copy_different_packing.sol | 6 +- .../copying/array_copy_including_array.sol | 10 +-- .../array_copy_storage_storage_struct.sol | 2 +- .../copying/array_copy_target_leftover.sol | 4 +- .../copying/array_copy_target_simple.sol | 4 +- .../copying/array_copy_target_simple_2.sol | 4 +- ...on_external_storage_to_storage_dynamic.sol | 4 +- ...o_storage_dynamic_different_mutability.sol | 4 +- .../array_of_struct_calldata_to_storage.sol | 2 +- .../array/copying/bytes_inside_mappings.sol | 8 +-- .../copying/bytes_storage_to_storage.sol | 20 +++--- .../copy_byte_array_in_struct_to_storage.sol | 8 +-- .../copying/copy_byte_array_to_storage.sol | 4 +- .../copy_function_internal_storage_array.sol | 2 +- .../array/copying/copy_removes_bytes_data.sol | 4 +- .../copying/copying_bytes_multiassign.sol | 4 +- .../memory_dyn_2d_bytes_to_storage.sol | 4 +- .../array/copying/storage_memory_nested.sol | 4 +- .../copying/storage_memory_nested_bytes.sol | 4 +- .../storage_memory_nested_from_pointer.sol | 4 +- .../copying/storage_memory_packed_dyn.sol | 4 +- .../array/delete/bytes_delete_element.sol | 4 +- .../array/dynamic_array_cleanup.sol | 4 +- .../array/fixed_array_cleanup.sol | 4 +- .../array/fixed_arrays_as_return_type.sol | 6 +- .../array/fixed_arrays_in_constructors.sol | 2 +- .../array/function_array_cross_calls.sol | 6 +- .../array/pop/array_pop_array_transition.sol | 6 +- .../array/pop/array_pop_uint16_transition.sol | 4 +- .../array/pop/array_pop_uint24_transition.sol | 4 +- .../array/pop/byte_array_pop_copy_long.sol | 4 +- .../pop/byte_array_pop_long_storage_empty.sol | 4 +- ...ray_pop_long_storage_empty_garbage_ref.sol | 4 +- .../array/pop/byte_array_pop_masking_long.sol | 4 +- .../push/array_push_nested_from_calldata.sol | 2 +- .../push/array_push_struct_from_calldata.sol | 2 +- .../array/push/byte_array_push_transition.sol | 6 +- .../array/push/nested_bytes_push.sol | 4 +- .../array/push/push_no_args_2d.sol | 6 +- .../array/push/push_no_args_bytes.sol | 4 +- .../copy_from_calldata_removes_bytes_data.sol | 6 +- .../constructor/arrays_in_constructors.sol | 2 +- .../bytes_in_constructors_packer.sol | 6 +- .../bytes_in_constructors_unpacker.sol | 4 +- .../constructor_arguments_external.sol | 2 +- .../constructor_static_array_argument.sol | 2 +- .../constructor/no_callvalue_check.sol | 2 +- .../constructor_inheritance_init_order.sol | 2 +- .../constructor_inheritance_init_order_2.sol | 2 +- .../semanticTests/constructor_with_params.sol | 2 +- .../constructor_with_params_inheritance.sol | 2 +- .../events/event_emit_from_other_contract.sol | 2 +- .../events/event_indexed_string.sol | 4 +- .../externalContracts/FixedFeeRegistrar.sol | 6 +- .../externalContracts/base64.sol | 12 ++-- .../externalContracts/deposit_contract.sol | 22 +++---- .../externalContracts/prbmath_signed.sol | 6 +- .../externalContracts/prbmath_unsigned.sol | 6 +- .../externalContracts/ramanujan_pi.sol | 6 +- .../semanticTests/externalContracts/snark.sol | 2 +- .../externalContracts/strings.sol | 12 ++-- .../external_call_to_nonexisting.sol | 6 +- ...ernal_call_to_nonexisting_debugstrings.sol | 6 +- .../functionCall/failed_create.sol | 6 +- .../functionCall/gas_and_value_basic.sol | 2 +- .../gas_and_value_brace_syntax.sol | 2 +- .../mapping_array_internal_argument.sol | 2 +- .../inheritance/value_for_constructor.sol | 2 +- .../balance_other_contract.sol | 2 +- .../libraries/internal_types_in_library.sol | 6 +- .../semanticTests/state/blockhash_basic.sol | 2 +- ...ta_struct_with_nested_array_to_storage.sol | 2 +- .../copy_struct_array_from_storage.sol | 2 +- ...truct_containing_bytes_copy_and_delete.sol | 4 +- .../semanticTests/structs/struct_copy.sol | 2 +- .../userDefinedValueType/calldata.sol | 8 +-- .../userDefinedValueType/erc20.sol | 4 +- .../semanticTests/various/address_code.sol | 4 +- .../various/destructuring_assignment.sol | 6 +- .../semanticTests/various/erc20.sol | 4 +- .../skip_dynamic_types_for_structs.sol | 4 +- .../semanticTests/various/value_complex.sol | 2 +- .../semanticTests/various/value_insane.sol | 2 +- .../viaYul/array_memory_index_access.sol | 6 +- .../viaYul/array_storage_index_access.sol | 28 ++++----- .../array_storage_index_zeroed_test.sol | 24 ++++---- .../viaYul/array_storage_push_empty.sol | 8 +-- .../viaYul/copy_struct_invalid_ir_bug.sol | 6 +- 101 files changed, 312 insertions(+), 253 deletions(-) diff --git a/Changelog.md b/Changelog.md index 63588731f..1b512d3e9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ Language Features: Compiler Features: * JSON-AST: Added selector field for errors and events. + * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump. Bugfixes: * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``. diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp index b04c2158c..31fb11f6f 100644 --- a/libevmasm/PeepholeOptimiser.cpp +++ b/libevmasm/PeepholeOptimiser.cpp @@ -233,6 +233,65 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod } }; +struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod +{ + static size_t applySimple( + AssemblyItem const& _eq, + AssemblyItem const& _iszero, + AssemblyItem const& _pushTag, + AssemblyItem const& _jumpi, + std::back_insert_iterator _out + ) + { + if ( + _eq == Instruction::EQ && + _iszero == Instruction::ISZERO && + _pushTag.type() == PushTag && + _jumpi == Instruction::JUMPI + ) + { + *_out = AssemblyItem(Instruction::SUB, _eq.location()); + *_out = _pushTag; + *_out = _jumpi; + return true; + } + else + return false; + } +}; + +// push_tag_1 jumpi push_tag_2 jump tag_1: -> iszero push_tag_2 jumpi tag_1: +struct DoubleJump: SimplePeepholeOptimizerMethod +{ + static size_t applySimple( + AssemblyItem const& _pushTag1, + AssemblyItem const& _jumpi, + AssemblyItem const& _pushTag2, + AssemblyItem const& _jump, + AssemblyItem const& _tag1, + std::back_insert_iterator _out + ) + { + if ( + _pushTag1.type() == PushTag && + _jumpi == Instruction::JUMPI && + _pushTag2.type() == PushTag && + _jump == Instruction::JUMP && + _tag1.type() == Tag && + _pushTag1.data() == _tag1.data() + ) + { + *_out = AssemblyItem(Instruction::ISZERO, _jumpi.location()); + *_out = _pushTag2; + *_out = _jumpi; + *_out = _tag1; + return true; + } + else + return false; + } +}; + struct JumpToNext: SimplePeepholeOptimizerMethod { static size_t applySimple( @@ -372,7 +431,7 @@ bool PeepholeOptimiser::optimise() applyMethods( state, PushPop(), OpPop(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(), - DupSwap(), IsZeroIsZeroJumpI(), JumpToNext(), UnreachableCode(), + DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(), TagConjunctions(), TruthyAnd(), Identity() ); if (m_optimisedItems.size() < m_items.size() || ( diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output index f6e7705c7..689e82ddb 100644 --- a/test/cmdlineTests/optimizer_user_yul/output +++ b/test/cmdlineTests/optimizer_user_yul/output @@ -58,10 +58,9 @@ tag_6: /* "optimizer_user_yul/input.sol":384:392 sload(5) */ dup1 /* "optimizer_user_yul/input.sol":376:509 for { } sload(5) { } {... */ - tag_8 + iszero + tag_6 jumpi - jump(tag_6) -tag_8: /* "optimizer_user_yul/input.sol":380:383 { } */ pop /* "optimizer_user_yul/input.sol":340:513 {... */ diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol index 06f9bcbbf..302e878d1 100644 --- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol +++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol @@ -25,5 +25,5 @@ contract C { // ---- // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb // gas irOptimized: 203312 -// gas legacy: 206084 -// gas legacyOptimized: 203068 +// gas legacy: 206075 +// gas legacyOptimized: 203059 diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol index c386cf3e8..5c7cc1cd5 100644 --- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol +++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol @@ -61,9 +61,9 @@ contract C { // ---- // test_bytes() -> // gas irOptimized: 371919 -// gas legacy: 418955 -// gas legacyOptimized: 326783 +// gas legacy: 416585 +// gas legacyOptimized: 322043 // test_uint256() -> // gas irOptimized: 523001 -// gas legacy: 586784 -// gas legacyOptimized: 451529 +// gas legacy: 583100 +// gas legacyOptimized: 444161 diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol index 9deed97f1..6c6336689 100644 --- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol +++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol @@ -62,9 +62,9 @@ contract C { // ---- // test_bytes() -> // gas irOptimized: 371919 -// gas legacy: 418955 -// gas legacyOptimized: 326783 +// gas legacy: 416585 +// gas legacyOptimized: 322043 // test_uint256() -> // gas irOptimized: 523001 -// gas legacy: 586784 -// gas legacyOptimized: 451529 +// gas legacy: 583100 +// gas legacyOptimized: 444161 diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol index cf5958d45..8f42fe5f7 100644 --- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol +++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol @@ -22,5 +22,5 @@ contract C { // f(uint256[][1]): 32, 32, 1, 42 -> true // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true // gas irOptimized: 171842 -// gas legacy: 141644 -// gas legacyOptimized: 121532 +// gas legacy: 140672 +// gas legacyOptimized: 119588 diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol index b6c6ad5f0..027ae4e16 100644 --- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol +++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol @@ -12,5 +12,5 @@ contract C { // ---- // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg" // gas irOptimized: 135918 -// gas legacy: 137190 -// gas legacyOptimized: 136082 +// gas legacy: 137181 +// gas legacyOptimized: 136073 diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol index 7a2a06a2e..7a6602f9d 100644 --- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol +++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol @@ -14,7 +14,7 @@ contract Test { // compileViaYul: also // ---- // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06 -// gas irOptimized: 189871 +// gas irOptimized: 189817 // gas legacy: 211149 // gas legacyOptimized: 206054 // data(uint256,uint256): 0x02, 0x02 -> 0x09 diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol index 2c238a54b..b176c7e86 100644 --- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol +++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol @@ -48,8 +48,8 @@ contract c { // storageEmpty -> 0 // test_long() -> 67 // gas irOptimized: 89148 -// gas legacy: 103590 -// gas legacyOptimized: 101044 +// gas legacy: 103039 +// gas legacyOptimized: 100493 // storageEmpty -> 0 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020 // gas legacy: 61930 diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol index 31879057a..76dce6a18 100644 --- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol +++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol @@ -19,6 +19,6 @@ contract c { // compileViaYul: also // ---- // test() -> 0 -// gas irOptimized: 158143 -// gas legacy: 189715 -// gas legacyOptimized: 184472 +// gas irOptimized: 157951 +// gas legacy: 188576 +// gas legacyOptimized: 183333 diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol index aaf990ef6..284c1b709 100644 --- a/test/libsolidity/semanticTests/array/bytes_length_member.sol +++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol @@ -16,6 +16,6 @@ contract c { // getLength() -> 0 // set(): 1, 2 -> true // gas irOptimized: 110439 -// gas legacy: 110726 -// gas legacyOptimized: 110567 +// gas legacy: 110723 +// gas legacyOptimized: 110564 // getLength() -> 68 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol index 6c876286b..f80da3500 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol @@ -22,7 +22,7 @@ contract c { // compileViaYul: also // ---- // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32 -// gas irOptimized: 650647 +// gas irOptimized: 650608 // gas legacy: 694515 // gas legacyOptimized: 694013 // retrieve() -> 9, 28, 9, 28, 4, 3, 32 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol index 81607a264..6d84d1ecd 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol @@ -21,6 +21,6 @@ contract c { // compileViaYul: also // ---- // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000 -// gas irOptimized: 212571 -// gas legacy: 221883 -// gas legacyOptimized: 220734 +// gas irOptimized: 212568 +// gas legacy: 221856 +// gas legacyOptimized: 220680 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol index 1c030deba..65dfc65ab 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol @@ -37,12 +37,12 @@ contract c { // compileViaYul: also // ---- // test() -> 0x02000202 -// gas irOptimized: 4652058 -// gas legacy: 4578341 -// gas legacyOptimized: 4548354 +// gas irOptimized: 4652050 +// gas legacy: 4578320 +// gas legacyOptimized: 4548312 // storageEmpty -> 1 // clear() -> 0, 0 // gas irOptimized: 4483175 -// gas legacy: 4410769 -// gas legacyOptimized: 4382531 +// gas legacy: 4410748 +// gas legacyOptimized: 4382489 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol index db26b4d47..676736dc1 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol @@ -19,7 +19,7 @@ contract c { // compileViaYul: also // ---- // test() -> 4, 5 -// gas irOptimized: 238826 +// gas irOptimized: 238799 // gas legacy: 238736 // gas legacyOptimized: 237159 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol index 1daa061a5..5325e9cdf 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol @@ -21,5 +21,5 @@ contract c { // ---- // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000 // gas irOptimized: 129167 -// gas legacy: 186406 -// gas legacyOptimized: 166126 +// gas legacy: 186184 +// gas legacyOptimized: 165682 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol index c87f70244..74cd2dc79 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol @@ -23,5 +23,5 @@ contract c { // ---- // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0 // gas irOptimized: 294772 -// gas legacy: 303653 -// gas legacyOptimized: 301999 +// gas legacy: 303626 +// gas legacyOptimized: 301945 diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol index c39f80275..5bf120994 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol @@ -23,5 +23,5 @@ contract c { // ---- // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00 // gas irOptimized: 273963 -// gas legacy: 276381 -// gas legacyOptimized: 275453 +// gas legacy: 276360 +// gas legacyOptimized: 275411 diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol index d872534cd..e13c15cab 100644 --- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol +++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol @@ -48,6 +48,6 @@ contract C { // ---- // copyExternalStorageArrayOfFunctionType() -> true // gas irOptimized: 104669 -// gas legacy: 108725 -// gas legacyOptimized: 102441 +// gas legacy: 108722 +// gas legacyOptimized: 102438 // copyInternalArrayOfFunctionType() -> true diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol index 71399a281..7f746c41a 100644 --- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol +++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol @@ -51,7 +51,7 @@ contract C { // ---- // copyExternalStorageArraysOfFunctionType() -> true // gas irOptimized: 104342 -// gas legacy: 108462 -// gas legacyOptimized: 102174 +// gas legacy: 108459 +// gas legacyOptimized: 102171 // copyInternalArrayOfFunctionType() -> true // gas legacy: 104178 diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol index b3d950ffa..e8d28e28b 100644 --- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol @@ -17,4 +17,4 @@ contract C { // compileViaYul: true // ---- // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12 -// gas irOptimized: 121048 +// gas irOptimized: 121021 diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol index ae2698551..26ad58f4c 100644 --- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol +++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol @@ -8,12 +8,12 @@ contract c { // ---- // set(uint256): 1, 2 -> true // gas irOptimized: 110604 -// gas legacy: 111091 -// gas legacyOptimized: 110736 +// gas legacy: 111088 +// gas legacyOptimized: 110733 // set(uint256): 2, 2, 3, 4, 5 -> true // gas irOptimized: 177564 -// gas legacy: 178021 -// gas legacyOptimized: 177666 +// gas legacy: 178018 +// gas legacyOptimized: 177663 // storageEmpty -> 0 // copy(uint256,uint256): 1, 2 -> true // storageEmpty -> 0 diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol index 87974f053..9c2e3b28e 100644 --- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol @@ -20,24 +20,24 @@ contract c { // f(uint256): 0 -> 0x20, 0x00 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00 // gas irOptimized: 121741 -// gas legacy: 124364 -// gas legacyOptimized: 119898 +// gas legacy: 123884 +// gas legacyOptimized: 119139 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671 // gas irOptimized: 130733 -// gas legacy: 135431 -// gas legacyOptimized: 130829 +// gas legacy: 134936 +// gas legacyOptimized: 130046 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000 // gas irOptimized: 137732 -// gas legacy: 142238 -// gas legacyOptimized: 137518 +// gas legacy: 141728 +// gas legacyOptimized: 136711 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992 // gas irOptimized: 152352 -// gas legacy: 160728 -// gas legacyOptimized: 152168 +// gas legacy: 159768 +// gas legacyOptimized: 150641 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000 // gas legacy: 59345 // gas legacyOptimized: 57279 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968 // gas irOptimized: 406089 -// gas legacy: 423017 -// gas legacyOptimized: 406021 +// gas legacy: 421067 +// gas legacyOptimized: 402910 diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol index 72a837d1b..d17978bf8 100644 --- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol @@ -38,11 +38,11 @@ contract C { // ---- // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000 // gas irOptimized: 179899 -// gas legacy: 180694 -// gas legacyOptimized: 180088 +// gas legacy: 180676 +// gas legacyOptimized: 180070 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000 // gas irOptimized: 107274 -// gas legacy: 107895 -// gas legacyOptimized: 107254 +// gas legacy: 107877 +// gas legacyOptimized: 107236 // h() -> 0x40, 0x60, 0x00, 0x00 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol index b73f3dc44..87c238206 100644 --- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol @@ -49,5 +49,5 @@ contract C { // ---- // f() -> 0xff // gas irOptimized: 121145 -// gas legacy: 128035 -// gas legacyOptimized: 123476 +// gas legacy: 128005 +// gas legacyOptimized: 123446 diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol index 7550a9225..64cb8edd1 100644 --- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol +++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol @@ -18,6 +18,6 @@ contract C { // compileViaYul: also // ---- // test() -> 7 -// gas irOptimized: 124041 +// gas irOptimized: 124037 // gas legacy: 205196 // gas legacyOptimized: 204987 diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol index 8d8bd4d50..9c435f3e1 100644 --- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol +++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol @@ -10,8 +10,8 @@ contract c { // ---- // set(): 1, 2, 3, 4, 5 -> true // gas irOptimized: 177390 -// gas legacy: 177656 -// gas legacyOptimized: 177496 +// gas legacy: 177653 +// gas legacyOptimized: 177493 // storageEmpty -> 0 // reset() -> true // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol index 7b2af9607..ecf9c838a 100644 --- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol +++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol @@ -22,8 +22,8 @@ contract sender { // ---- // (): 7 -> // gas irOptimized: 110954 -// gas legacy: 111082 -// gas legacyOptimized: 111027 +// gas legacy: 111073 +// gas legacyOptimized: 111018 // val() -> 0 // forward(bool): true -> true // val() -> 0x80 diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol index 3d4623b79..24de47c27 100644 --- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol @@ -21,5 +21,5 @@ contract C { // ---- // f() -> 3 // gas irOptimized: 129916 -// gas legacy: 130307 -// gas legacyOptimized: 129363 +// gas legacy: 130181 +// gas legacyOptimized: 129198 diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol index ec58360cd..cbeaefd82 100644 --- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol +++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol @@ -20,5 +20,5 @@ contract C { // ---- // f() -> 1, 2, 3, 4, 5, 6, 7 // gas irOptimized: 207785 -// gas legacy: 212325 -// gas legacyOptimized: 211486 +// gas legacy: 212313 +// gas legacyOptimized: 211462 diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol index f94b442f3..35fd24fd8 100644 --- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol +++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol @@ -14,5 +14,5 @@ contract C { // ---- // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000 // gas irOptimized: 202840 -// gas legacy: 204459 -// gas legacyOptimized: 203437 +// gas legacy: 204441 +// gas legacyOptimized: 203419 diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol index ece6f7969..e595c4816 100644 --- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol +++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol @@ -21,5 +21,5 @@ contract C { // ---- // f() -> 1, 2, 3, 4, 5, 6, 7 // gas irOptimized: 207785 -// gas legacy: 212330 -// gas legacyOptimized: 211491 +// gas legacy: 212318 +// gas legacyOptimized: 211467 diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol index abcd72ee1..f212c573a 100644 --- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol +++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol @@ -16,5 +16,5 @@ contract C { // ---- // f() -> 2, 3, 4 // gas irOptimized: 114120 -// gas legacy: 126449 -// gas legacyOptimized: 120902 +// gas legacy: 126350 +// gas legacyOptimized: 120704 diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol index 149e8768d..00c8c41f6 100644 --- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol +++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol @@ -19,5 +19,5 @@ contract c { // ---- // test1() -> true // gas irOptimized: 225894 -// gas legacy: 255577 -// gas legacyOptimized: 248611 +// gas legacy: 254650 +// gas legacyOptimized: 247384 diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol index 019a3fca0..a9eff11f4 100644 --- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol +++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol @@ -17,8 +17,8 @@ contract c { // storageEmpty -> 1 // fill() -> // gas irOptimized: 519886 -// gas legacy: 521773 -// gas legacyOptimized: 517048 +// gas legacy: 521710 +// gas legacyOptimized: 516922 // storageEmpty -> 0 // halfClear() -> // storageEmpty -> 0 diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol index b09cb5812..c2a2a7b46 100644 --- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol +++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol @@ -14,8 +14,8 @@ contract c { // storageEmpty -> 1 // fill() -> // gas irOptimized: 465544 -// gas legacy: 471460 -// gas legacyOptimized: 467520 +// gas legacy: 471400 +// gas legacyOptimized: 467400 // storageEmpty -> 0 // clear() -> // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol index fcf41823e..3b93c930a 100644 --- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol +++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol @@ -21,6 +21,6 @@ contract B { // compileViaYul: also // ---- // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004 -// gas irOptimized: 130152 -// gas legacy: 234943 -// gas legacyOptimized: 132863 +// gas irOptimized: 129910 +// gas legacy: 234719 +// gas legacyOptimized: 132639 diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol index 07a054514..0521c45de 100644 --- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol +++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol @@ -11,7 +11,7 @@ contract Creator { // compileViaYul: also // ---- // constructor(): 1, 2, 3, 4 -> -// gas irOptimized: 129908 +// gas irOptimized: 128995 // gas legacy: 176789 // gas legacyOptimized: 129585 // r() -> 4 diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol index 73f9799d4..050595439 100644 --- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol +++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol @@ -45,6 +45,6 @@ contract C { // compileViaYul: also // ---- // test() -> 5, 6, 7 -// gas irOptimized: 298983 -// gas legacy: 452172 -// gas legacyOptimized: 285017 +// gas irOptimized: 298735 +// gas legacy: 452136 +// gas legacyOptimized: 284945 diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol index f2a98f993..3b6fa4b5b 100644 --- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol +++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol @@ -25,7 +25,7 @@ contract c { // compileViaYul: also // ---- // test() -> 1, 2, 3 -// gas irOptimized: 2271482 -// gas legacy: 2273722 -// gas legacyOptimized: 2262396 +// gas irOptimized: 2271050 +// gas legacy: 2273434 +// gas legacyOptimized: 2261820 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol index 4be29a15d..6ec59a75e 100644 --- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol +++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol @@ -21,6 +21,6 @@ contract c { // ---- // test() -> 38, 28, 18 // gas irOptimized: 188649 -// gas legacy: 189780 -// gas legacyOptimized: 178870 +// gas legacy: 189492 +// gas legacyOptimized: 178294 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol index 08a403174..de4b2fa1c 100644 --- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol +++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol @@ -21,6 +21,6 @@ contract c { // ---- // test() -> 20, 10 // gas irOptimized: 159175 -// gas legacy: 159459 -// gas legacyOptimized: 153281 +// gas legacy: 159279 +// gas legacyOptimized: 152921 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol index 387d21872..c9f81f37a 100644 --- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol +++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol @@ -13,5 +13,5 @@ contract c { // ---- // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000 // gas irOptimized: 109503 -// gas legacy: 127309 -// gas legacyOptimized: 124136 +// gas legacy: 126728 +// gas legacyOptimized: 123444 diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol index c911b1b7c..2b63293cb 100644 --- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol +++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol @@ -19,6 +19,6 @@ contract c { // ---- // test() -> true // gas irOptimized: 196545 -// gas legacy: 229864 -// gas legacyOptimized: 210964 +// gas legacy: 228685 +// gas legacyOptimized: 209662 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol index 38c0c84d6..d2358b1e2 100644 --- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol +++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol @@ -18,6 +18,6 @@ contract c { // ---- // test() -> // gas irOptimized: 142640 -// gas legacy: 165363 -// gas legacyOptimized: 159446 +// gas legacy: 164430 +// gas legacyOptimized: 158513 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol index 6d314fb27..f6f9c10e8 100644 --- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol +++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol @@ -13,5 +13,5 @@ contract c { // ---- // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000 // gas irOptimized: 108493 -// gas legacy: 126187 -// gas legacyOptimized: 123261 +// gas legacy: 125610 +// gas legacyOptimized: 122582 diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol index a4be5ad90..55a7d1bfe 100644 --- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol +++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol @@ -14,6 +14,6 @@ contract C { // compileViaYul: also // ---- // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1 -// gas irOptimized: 113267 +// gas irOptimized: 113258 // gas legacy: 113686 // gas legacyOptimized: 113499 diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol index 7546a664b..299aa79c7 100644 --- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol +++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol @@ -18,6 +18,6 @@ contract c { // compileViaYul: also // ---- // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5 -// gas irOptimized: 138732 +// gas irOptimized: 138705 // gas legacy: 145150 // gas legacyOptimized: 139171 diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol index 78c817d44..4b8113c1b 100644 --- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol +++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol @@ -17,6 +17,6 @@ contract c { // compileViaYul: also // ---- // test() -> 0 -// gas irOptimized: 176848 -// gas legacy: 218028 -// gas legacyOptimized: 205124 +// gas irOptimized: 176497 +// gas legacy: 216790 +// gas legacyOptimized: 203886 diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol index 262ba724a..7c4bdcb9a 100644 --- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol +++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol @@ -16,5 +16,5 @@ contract C { // ---- // f() -> // gas irOptimized: 179590 -// gas legacy: 180620 -// gas legacyOptimized: 180403 +// gas legacy: 180602 +// gas legacyOptimized: 180385 diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol index 761bf3ee3..610639388 100644 --- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol +++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol @@ -30,14 +30,14 @@ contract C { // l() -> 0 // f(uint256,uint256): 42, 64 -> // gas irOptimized: 112528 -// gas legacy: 108234 -// gas legacyOptimized: 102245 +// gas legacy: 108105 +// gas legacyOptimized: 101987 // l() -> 1 // ll(uint256): 0 -> 43 // a(uint256,uint256): 0, 42 -> 64 // f(uint256,uint256): 84, 128 -> // gas irOptimized: 116400 -// gas legacy: 107780 +// gas legacy: 107525 // gas legacyOptimized: 96331 // l() -> 2 // ll(uint256): 1 -> 85 diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol index 830f25b02..6c7ae703b 100644 --- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol +++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol @@ -24,8 +24,8 @@ contract C { // l() -> 0 // g(uint256): 70 -> // gas irOptimized: 185936 -// gas legacy: 184991 -// gas legacyOptimized: 180608 +// gas legacy: 183811 +// gas legacyOptimized: 179218 // l() -> 70 // a(uint256): 69 -> left(69) // f() -> diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol index 7773c6832..4c993d2d2 100644 --- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol +++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol @@ -11,9 +11,9 @@ contract c { // compileViaYul: also // ---- // (): 1, 2, 3, 4, 5 -> -// gas irOptimized: 155181 -// gas legacy: 155254 -// gas legacyOptimized: 155217 +// gas irOptimized: 155170 +// gas legacy: 155251 +// gas legacyOptimized: 155214 // checkIfDataIsEmpty() -> false // sendMessage() -> true, 0x40, 0 // checkIfDataIsEmpty() -> true diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol index 031deb64c..9f9e96283 100644 --- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol +++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8 -// gas irOptimized: 443989 +// gas irOptimized: 443720 // gas legacy: 590683 // gas legacyOptimized: 448326 diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol index 8264a93ed..a05376298 100644 --- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol +++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol @@ -26,6 +26,6 @@ contract Creator { // compileViaYul: also // ---- // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h" -// gas irOptimized: 300837 -// gas legacy: 428917 -// gas legacyOptimized: 298128 +// gas irOptimized: 300834 +// gas legacy: 428711 +// gas legacyOptimized: 297922 diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol index 1a93f53b3..70a636c29 100644 --- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol +++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol @@ -11,7 +11,7 @@ contract Test { // ---- // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> // gas irOptimized: 291443 -// gas legacy: 309842 -// gas legacyOptimized: 260801 +// gas legacy: 309607 +// gas legacyOptimized: 260566 // m_x() -> 7 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol index 2206fd351..bb9567dd0 100644 --- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol +++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol @@ -19,7 +19,7 @@ contract Main { // compileViaYul: also // ---- // constructor(): "abc", true -// gas irOptimized: 107175 +// gas irOptimized: 106267 // gas legacy: 145838 // gas legacyOptimized: 104017 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol index f6fab1092..4d3c98dbe 100644 --- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol +++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol @@ -12,7 +12,7 @@ contract C { // compileViaYul: also // ---- // constructor(): 1, 2, 3, 4 -> -// gas irOptimized: 174905 +// gas irOptimized: 174041 // gas legacy: 221377 // gas legacyOptimized: 177671 // a() -> 1 diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol index 3fdbb0785..1352c6e1c 100644 --- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol +++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol @@ -19,6 +19,6 @@ contract C { // compileViaYul: also // ---- // f(), 2000 ether -> true -// gas irOptimized: 123037 +// gas irOptimized: 123036 // gas legacy: 123226 // gas legacyOptimized: 123092 diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol index 2518deb92..f17ffe54f 100644 --- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol +++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol @@ -15,5 +15,5 @@ contract B is A { // compileViaYul: true // ---- // constructor() -> -// gas irOptimized: 122017 +// gas irOptimized: 121153 // y() -> 42 diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol index 68506528b..5fafdd045 100644 --- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol +++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol @@ -12,7 +12,7 @@ contract B is A { // compileViaYul: also // ---- // constructor() -> -// gas irOptimized: 122017 +// gas irOptimized: 121153 // gas legacy: 135046 // gas legacyOptimized: 116176 // y() -> 42 diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol index cb6192774..0b8982d40 100644 --- a/test/libsolidity/semanticTests/constructor_with_params.sol +++ b/test/libsolidity/semanticTests/constructor_with_params.sol @@ -11,7 +11,7 @@ contract C { // compileViaYul: also // ---- // constructor(): 2, 0 -> -// gas irOptimized: 104227 +// gas irOptimized: 103363 // gas legacy: 117158 // i() -> 2 // k() -> 0 diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol index 3d90783f8..9f33757b1 100644 --- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol +++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol @@ -14,7 +14,7 @@ contract D is C { // compileViaYul: also // ---- // constructor(): 2, 0 -> -// gas irOptimized: 124844 +// gas irOptimized: 123980 // gas legacy: 139250 // gas legacyOptimized: 119367 // i() -> 2 diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol index 5ec47a4a9..19c05a156 100644 --- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol +++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol @@ -17,7 +17,7 @@ contract C { // compileViaYul: also // ---- // constructor() -> -// gas irOptimized: 173672 +// gas irOptimized: 172802 // gas legacy: 250376 // gas legacyOptimized: 174522 // deposit(bytes32), 18 wei: 0x1234 -> diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol index d35db93c4..5d3ad5840 100644 --- a/test/libsolidity/semanticTests/events/event_indexed_string.sol +++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol @@ -20,5 +20,5 @@ contract C { // deposit() -> // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81 // gas irOptimized: 343396 -// gas legacy: 390742 -// gas legacyOptimized: 376774 +// gas legacy: 388679 +// gas legacyOptimized: 374441 diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol index e6d6c478b..9965c786e 100644 --- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol +++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol @@ -76,9 +76,9 @@ contract FixedFeeRegistrar is Registrar { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 413485 -// gas legacy: 936897 -// gas legacyOptimized: 490983 +// gas irOptimized: 413269 +// gas legacy: 935817 +// gas legacyOptimized: 489951 // reserve(string), 69 ether: 0x20, 3, "abc" -> // ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 // gas irOptimized: 45967 diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol index fd17c5d78..02c858763 100644 --- a/test/libsolidity/semanticTests/externalContracts/base64.sol +++ b/test/libsolidity/semanticTests/externalContracts/base64.sol @@ -35,8 +35,8 @@ contract test { // ---- // constructor() // gas irOptimized: 450044 -// gas legacy: 766936 -// gas legacyOptimized: 543094 +// gas legacy: 765640 +// gas legacyOptimized: 541810 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg==" // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8=" @@ -53,9 +53,9 @@ contract test { // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy" // encode_inline_asm_large() // gas irOptimized: 1385047 -// gas legacy: 1658033 -// gas legacyOptimized: 1210033 +// gas legacy: 1652033 +// gas legacyOptimized: 1201033 // encode_no_asm_large() // gas irOptimized: 3335101 -// gas legacy: 4801077 -// gas legacyOptimized: 2929077 +// gas legacy: 4777077 +// gas legacyOptimized: 2890077 diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol index d98e73792..42a9207fd 100644 --- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol +++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol @@ -178,35 +178,35 @@ contract DepositContract is IDepositContract, ERC165 { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 1543359 -// gas legacy: 2436584 -// gas legacyOptimized: 1776483 +// gas irOptimized: 1542927 +// gas legacy: 2435803 +// gas legacyOptimized: 1775425 // supportsInterface(bytes4): 0x0 -> 0 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 # // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id # // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id # // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e // gas irOptimized: 122135 -// gas legacy: 150465 -// gas legacyOptimized: 122798 +// gas legacy: 150273 +// gas legacyOptimized: 122510 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit # // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input # // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e // gas irOptimized: 122135 -// gas legacy: 150465 -// gas legacyOptimized: 122798 +// gas legacy: 150273 +// gas legacyOptimized: 122510 // get_deposit_count() -> 0x20, 8, 0 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 # // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438 // gas irOptimized: 122114 -// gas legacy: 150475 -// gas legacyOptimized: 122811 +// gas legacy: 150283 +// gas legacyOptimized: 122523 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac # // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee // gas irOptimized: 122114 -// gas legacy: 150475 -// gas legacyOptimized: 122811 +// gas legacy: 150283 +// gas legacyOptimized: 122523 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000 diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol index 56abe4a9d..bcb4238a7 100644 --- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol +++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol @@ -50,9 +50,9 @@ contract test { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 1938339 -// gas legacy: 2480887 -// gas legacyOptimized: 1874490 +// gas irOptimized: 1937251 +// gas legacy: 2478955 +// gas legacyOptimized: 1877737 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328 // gas irOptimized: 22137 // gas legacy: 22767 diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol index 0488179f1..46e059885 100644 --- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol +++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol @@ -50,9 +50,9 @@ contract test { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 1792108 -// gas legacy: 2250130 -// gas legacyOptimized: 1746528 +// gas irOptimized: 1791688 +// gas legacy: 2248594 +// gas legacyOptimized: 1749096 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328 // gas irOptimized: 22004 // gas legacy: 22497 diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol index 45976217b..eb1b5d841 100644 --- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol +++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol @@ -35,9 +35,9 @@ contract test { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 465789 -// gas legacy: 672749 -// gas legacyOptimized: 479606 +// gas irOptimized: 464709 +// gas legacy: 671453 +// gas legacyOptimized: 480242 // prb_pi() -> 3141592656369545286 // gas irOptimized: 57478 // gas legacy: 98903 diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol index 8f6b939fd..05b4ddb25 100644 --- a/test/libsolidity/semanticTests/externalContracts/snark.sol +++ b/test/libsolidity/semanticTests/externalContracts/snark.sol @@ -298,5 +298,5 @@ contract Test { // verifyTx() -> true // ~ emit Verified(string): 0x20, 0x16, "Successfully verified." // gas irOptimized: 95261 -// gas legacy: 114094 +// gas legacy: 113731 // gas legacyOptimized: 83670 diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol index a16f884e8..9f7084410 100644 --- a/test/libsolidity/semanticTests/externalContracts/strings.sol +++ b/test/libsolidity/semanticTests/externalContracts/strings.sol @@ -51,9 +51,9 @@ contract test { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 707330 -// gas legacy: 1130761 -// gas legacyOptimized: 750416 +// gas irOptimized: 704522 +// gas legacy: 1127730 +// gas legacyOptimized: 753807 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0 // gas irOptimized: 22660 // gas legacy: 23190 @@ -71,6 +71,6 @@ contract test { // gas legacy: 31621 // gas legacyOptimized: 27914 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020 -// gas irOptimized: 2040045 -// gas legacy: 4381235 -// gas legacyOptimized: 2317529 +// gas irOptimized: 2040024 +// gas legacy: 4356286 +// gas legacyOptimized: 2268278 diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol index 030aeaa10..b74680c96 100644 --- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol +++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol @@ -25,9 +25,9 @@ contract C { // compileViaYul: also // ---- // constructor(), 1 ether -> -// gas irOptimized: 315341 -// gas legacy: 465314 -// gas legacyOptimized: 304481 +// gas irOptimized: 314681 +// gas legacy: 464030 +// gas legacyOptimized: 304049 // f(uint256): 0 -> FAILURE // f(uint256): 1 -> FAILURE // f(uint256): 2 -> FAILURE diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol index cfbf1bcc1..124f69034 100644 --- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol +++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol @@ -27,9 +27,9 @@ contract C { // revertStrings: debug // ---- // constructor(), 1 ether -> -// gas irOptimized: 452673 -// gas legacy: 834272 -// gas legacyOptimized: 510004 +// gas irOptimized: 449901 +// gas legacy: 832976 +// gas legacyOptimized: 509560 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol index 2ebf8740d..639f39945 100644 --- a/test/libsolidity/semanticTests/functionCall/failed_create.sol +++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol @@ -18,9 +18,9 @@ contract C { // compileViaYul: also // ---- // constructor(), 20 wei -// gas irOptimized: 219285 -// gas legacy: 294569 -// gas legacyOptimized: 174699 +// gas irOptimized: 219069 +// gas legacy: 294335 +// gas legacyOptimized: 174279 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179 // x() -> 1 // f(uint256): 20 -> FAILURE diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol index 4321753d6..ac51947c3 100644 --- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol +++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol @@ -41,7 +41,7 @@ contract test { // compileViaYul: also // ---- // constructor(), 20 wei -> -// gas irOptimized: 283040 +// gas irOptimized: 282824 // gas legacy: 402654 // gas legacyOptimized: 274470 // sendAmount(uint256): 5 -> 5 diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol index 2f89517b7..0eb9648be 100644 --- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol +++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol @@ -40,7 +40,7 @@ contract test { // compileViaYul: also // ---- // constructor(), 20 wei -> -// gas irOptimized: 283040 +// gas irOptimized: 282824 // gas legacy: 402654 // gas legacyOptimized: 274470 // sendAmount(uint256): 5 -> 5 diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol index f1e2f1116..92b75ba4e 100644 --- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol +++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol @@ -20,7 +20,7 @@ contract test { // compileViaYul: also // ---- // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0 -// gas irOptimized: 111929 +// gas irOptimized: 111914 // gas legacy: 113806 // gas legacyOptimized: 111781 // get(uint8): 1 -> 21, 22, 42, 43 diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol index aea318e65..52ed2bc76 100644 --- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol +++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol @@ -42,7 +42,7 @@ contract Main { // compileViaYul: also // ---- // constructor(), 22 wei -> -// gas irOptimized: 284321 +// gas irOptimized: 282981 // gas legacy: 402045 // gas legacyOptimized: 266772 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol index 8d37ed809..94128fbc4 100644 --- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol +++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol @@ -18,7 +18,7 @@ contract ClientReceipt { // compileViaYul: also // ---- // constructor(), 2000 wei -> -// gas irOptimized: 188162 +// gas irOptimized: 187946 // gas legacy: 235195 // gas legacyOptimized: 176766 // balance -> 1500 diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol index ac61fad71..9cf5f65ff 100644 --- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol +++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol @@ -25,6 +25,6 @@ contract Test { // ---- // library: Lib // f() -> 4, 0x11 -// gas irOptimized: 115874 -// gas legacy: 135952 -// gas legacyOptimized: 119643 +// gas irOptimized: 115868 +// gas legacy: 135820 +// gas legacyOptimized: 119448 diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol index 9abeb90aa..513bf0b8e 100644 --- a/test/libsolidity/semanticTests/state/blockhash_basic.sol +++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol @@ -14,7 +14,7 @@ contract C { // compileViaYul: also // ---- // constructor() -// gas irOptimized: 115297 +// gas irOptimized: 115278 // gas legacy: 155081 // gas legacyOptimized: 107997 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737 diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol index 6e65cd239..c5c484df7 100644 --- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol +++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol @@ -18,6 +18,6 @@ contract C { // compileViaYul: also // ---- // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88 -// gas irOptimized: 203312 +// gas irOptimized: 203303 // gas legacy: 209194 // gas legacyOptimized: 203583 diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol index 258ff350b..876a7f6c8 100644 --- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol +++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol @@ -88,7 +88,7 @@ contract Test { // compileViaYul: also // ---- // test1() -> true -// gas irOptimized: 150545 +// gas irOptimized: 150533 // gas legacy: 150266 // gas legacyOptimized: 149875 // test2() -> true diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol index 6b5d1f022..f77156d64 100644 --- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol +++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol @@ -26,8 +26,8 @@ contract c { // storageEmpty -> 1 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true // gas irOptimized: 133728 -// gas legacy: 134436 -// gas legacyOptimized: 133879 +// gas legacy: 134433 +// gas legacyOptimized: 133876 // test(uint256): 32 -> "3" // storageEmpty -> 0 // copy() -> true diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol index 03a063bb8..62a8baaed 100644 --- a/test/libsolidity/semanticTests/structs/struct_copy.sol +++ b/test/libsolidity/semanticTests/structs/struct_copy.sol @@ -43,7 +43,7 @@ contract c { // gas legacyOptimized: 110006 // retrieve(uint256): 7 -> 1, 3, 4, 2 // copy(uint256,uint256): 7, 8 -> true -// gas irOptimized: 118597 +// gas irOptimized: 118591 // gas legacy: 119166 // gas legacyOptimized: 118622 // retrieve(uint256): 7 -> 1, 3, 4, 2 diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol index 56ad74c54..3f4309c86 100644 --- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol +++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol @@ -51,12 +51,12 @@ contract C { // compileViaYul: also // ---- // test_f() -> true -// gas irOptimized: 122364 -// gas legacy: 126168 -// gas legacyOptimized: 123199 +// gas irOptimized: 122334 +// gas legacy: 126150 +// gas legacyOptimized: 123163 // test_g() -> true // gas irOptimized: 95980 -// gas legacy: 101311 +// gas legacy: 101281 // gas legacyOptimized: 96566 // addresses(uint256): 0 -> 0x18 // addresses(uint256): 1 -> 0x19 diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol index c2c5f3cdc..aea108e2b 100644 --- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol +++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol @@ -115,8 +115,8 @@ contract ERC20 { // ---- // constructor() // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14 -// gas irOptimized: 423885 -// gas legacy: 861559 +// gas irOptimized: 423453 +// gas legacy: 860880 // gas legacyOptimized: 420959 // totalSupply() -> 20 // gas irOptimized: 23415 diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol index 38e0fb13f..594adea40 100644 --- a/test/libsolidity/semanticTests/various/address_code.sol +++ b/test/libsolidity/semanticTests/various/address_code.sol @@ -18,8 +18,8 @@ contract C { // ---- // constructor() -> // gas irOptimized: 199723 -// gas legacy: 241124 -// gas legacyOptimized: 155549 +// gas legacy: 240889 +// gas legacyOptimized: 155314 // initCode() -> 0x20, 0 // f() -> true // g() -> 0 diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol index cc93152ea..4b253a63e 100644 --- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol +++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol @@ -36,6 +36,6 @@ contract C { // compileViaYul: also // ---- // f(bytes): 0x20, 0x5, "abcde" -> 0 -// gas irOptimized: 240691 -// gas legacy: 240358 -// gas legacyOptimized: 239682 +// gas irOptimized: 240667 +// gas legacy: 240349 +// gas legacyOptimized: 239673 diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol index 9ba4e3cb7..9f9084825 100644 --- a/test/libsolidity/semanticTests/various/erc20.sol +++ b/test/libsolidity/semanticTests/various/erc20.sol @@ -98,8 +98,8 @@ contract ERC20 { // ---- // constructor() // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14 -// gas irOptimized: 419330 -// gas legacy: 833310 +// gas irOptimized: 418910 +// gas legacy: 832643 // gas legacyOptimized: 416135 // totalSupply() -> 20 // gas irOptimized: 23415 diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol index 30a2d9f65..9e334c5e5 100644 --- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol +++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol @@ -23,5 +23,5 @@ contract C { // ---- // g() -> 2, 6 // gas irOptimized: 178812 -// gas legacy: 180762 -// gas legacyOptimized: 179481 +// gas legacy: 180753 +// gas legacyOptimized: 179472 diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol index 5d8bda5dd..78eb2eec7 100644 --- a/test/libsolidity/semanticTests/various/value_complex.sol +++ b/test/libsolidity/semanticTests/various/value_complex.sol @@ -22,7 +22,7 @@ contract test { // compileViaYul: also // ---- // constructor(), 20 wei -> -// gas irOptimized: 192113 +// gas irOptimized: 191249 // gas legacy: 265006 // gas legacyOptimized: 182842 // sendAmount(uint256): 5 -> 8 diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol index 0b2b1735b..4b57d19e6 100644 --- a/test/libsolidity/semanticTests/various/value_insane.sol +++ b/test/libsolidity/semanticTests/various/value_insane.sol @@ -21,7 +21,7 @@ contract test { // compileViaYul: also // ---- // constructor(), 20 wei -> -// gas irOptimized: 194261 +// gas irOptimized: 193397 // gas legacy: 266728 // gas legacyOptimized: 184762 // sendAmount(uint256): 5 -> 8 diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol index 6ef403dcc..772c77af2 100644 --- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol +++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol @@ -28,9 +28,9 @@ contract C { // index(uint256): 10 -> true // index(uint256): 20 -> true // index(uint256): 0xFF -> true -// gas irOptimized: 138410 -// gas legacy: 248854 -// gas legacyOptimized: 152638 +// gas irOptimized: 137645 +// gas legacy: 247324 +// gas legacyOptimized: 149578 // accessIndex(uint256,int256): 10, 1 -> 2 // accessIndex(uint256,int256): 10, 0 -> 1 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32 diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol index 24d0e9f14..63096bed6 100644 --- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol +++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol @@ -19,32 +19,32 @@ contract C { // test_indices(uint256): 1 -> // test_indices(uint256): 129 -> // gas irOptimized: 3032986 -// gas legacy: 3071205 -// gas legacyOptimized: 3011873 +// gas legacy: 3070431 +// gas legacyOptimized: 3010325 // test_indices(uint256): 5 -> // gas irOptimized: 367642 -// gas legacy: 369241 -// gas legacyOptimized: 366149 +// gas legacy: 369211 +// gas legacyOptimized: 366089 // test_indices(uint256): 10 -> // test_indices(uint256): 15 -> // gas irOptimized: 72860 // test_indices(uint256): 0xFF -> // gas irOptimized: 3438610 -// gas legacy: 3514167 -// gas legacyOptimized: 3398107 +// gas legacy: 3512637 +// gas legacyOptimized: 3395047 // test_indices(uint256): 1000 -> // gas irOptimized: 18318372 -// gas legacy: 18617999 -// gas legacyOptimized: 18178944 +// gas legacy: 18611999 +// gas legacyOptimized: 18166944 // test_indices(uint256): 129 -> // gas irOptimized: 2733570 -// gas legacy: 2772735 -// gas legacyOptimized: 2716547 +// gas legacy: 2771961 +// gas legacyOptimized: 2714999 // test_indices(uint256): 128 -> // gas irOptimized: 426682 -// gas legacy: 467272 -// gas legacyOptimized: 418424 +// gas legacy: 466504 +// gas legacyOptimized: 416888 // test_indices(uint256): 1 -> // gas irOptimized: 363074 -// gas legacy: 363407 -// gas legacyOptimized: 361811 +// gas legacy: 363401 +// gas legacyOptimized: 361799 diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol index b2e0cb546..4361001f4 100644 --- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol +++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol @@ -54,18 +54,18 @@ contract C { // ---- // test_zeroed_indicies(uint256): 1 -> // test_zeroed_indicies(uint256): 5 -> -// gas irOptimized: 131197 -// gas legacy: 132367 -// gas legacyOptimized: 129586 +// gas irOptimized: 131193 +// gas legacy: 132331 +// gas legacyOptimized: 129514 // test_zeroed_indicies(uint256): 10 -> -// gas irOptimized: 174805 -// gas legacy: 177329 -// gas legacyOptimized: 172224 +// gas irOptimized: 174811 +// gas legacy: 177248 +// gas legacyOptimized: 172062 // test_zeroed_indicies(uint256): 15 -> -// gas irOptimized: 198055 -// gas legacy: 201954 -// gas legacyOptimized: 194604 +// gas irOptimized: 198071 +// gas legacy: 201828 +// gas legacyOptimized: 194352 // test_zeroed_indicies(uint256): 0xFF -> -// gas irOptimized: 6098185 -// gas legacy: 6163149 -// gas legacyOptimized: 6029474 +// gas irOptimized: 6098681 +// gas legacy: 6160863 +// gas legacyOptimized: 6024902 diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol index 5c7c4cba8..7291e1e34 100644 --- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol +++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol @@ -14,12 +14,12 @@ contract C { // ---- // pushEmpty(uint256): 128 // gas irOptimized: 412570 -// gas legacy: 417287 -// gas legacyOptimized: 399048 +// gas legacy: 416903 +// gas legacyOptimized: 398280 // pushEmpty(uint256): 256 // gas irOptimized: 702558 -// gas legacy: 715083 -// gas legacyOptimized: 688908 +// gas legacy: 714315 +// gas legacyOptimized: 687372 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas # // gas irOptimized: 100000000 // gas legacy: 100000000 diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol index 05b7e668b..b2df7d748 100644 --- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol +++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol @@ -23,6 +23,6 @@ contract C { // compileViaYul: also // ---- // f() -> -// gas irOptimized: 112998 -// gas legacy: 112937 -// gas legacyOptimized: 112608 +// gas irOptimized: 112995 +// gas legacy: 112931 +// gas legacyOptimized: 112602 From b5caa774826492e8c902d64af2a900ea1f8315a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 10 Mar 2022 14:52:51 +0100 Subject: [PATCH 21/58] euler: Use project's own TEST_TIMEOUT var for changing the timeout instead of mocha settings --- test/externalTests/euler.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh index 6a73f00e5..39283bcd5 100755 --- a/test/externalTests/euler.sh +++ b/test/externalTests/euler.sh @@ -32,7 +32,10 @@ BINARY_PATH="$2" SELECTED_PRESETS="$3" function compile_fn { npm run compile; } -function test_fn { npx --no hardhat --no-compile test; } +function test_fn { + # The default timeout of 20000 ms is too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765). + TEST_TIMEOUT=100000 npx --no hardhat --no-compile test +} function euler_test { @@ -63,8 +66,6 @@ function euler_test force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH" force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" force_hardhat_unlimited_contract_size "$config_file" - # Workaround for the timeout that's too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765) - force_hardhat_timeout "$config_file" "" 100000 npm install replace_version_pragmas From 4f02be110c6181839adfc1145bf07a79a095c711 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 5 May 2021 18:02:35 +0200 Subject: [PATCH 22/58] Unused store eliminator. --- Changelog.md | 1 + libevmasm/SemanticInformation.cpp | 4 +- libsolidity/interface/OptimiserSettings.h | 2 +- libyul/CMakeLists.txt | 2 + libyul/optimiser/Suite.cpp | 3 + libyul/optimiser/UnusedStoreEliminator.cpp | 379 ++++++++++++++++++ libyul/optimiser/UnusedStoreEliminator.h | 119 ++++++ .../constant_optimizer_yul/output | 1 - .../output | 12 +- .../output | 12 +- .../output | 12 +- .../debug_info_in_yul_snippet_escaping/output | 2 - .../output | 2 - .../ir_compiler_subobjects/output | 2 - .../output | 16 +- .../output | 3 - .../keccak_optimization_deploy_code/output | 3 - .../keccak_optimization_low_runs/output | 1 - .../output.json | 27 +- .../output.json | 12 +- .../output.json | 12 +- .../output.json | 12 +- .../output.json | 10 +- .../viair_subobject_optimization/output | 11 - test/cmdlineTests/viair_subobjects/output | 2 - test/formal/redundant_store_unrelated.py | 63 +++ .../array_copy_storage_storage_dyn_dyn.sol | 2 +- .../copying/copy_byte_array_to_storage.sol | 2 +- .../delete/delete_storage_array_packed.sol | 2 +- ...ray_pop_long_storage_empty_garbage_ref.sol | 2 +- .../semanticTests/array/reusing_memory.sol | 2 +- .../constructor_arguments_external.sol | 2 +- .../constructor/no_callvalue_check.sol | 2 +- .../semanticTests/constructor_with_params.sol | 2 +- ...ructor_with_params_diamond_inheritance.sol | 2 +- .../constructor_with_params_inheritance.sol | 2 +- .../creation_function_call_with_args.sol | 2 +- .../creation_function_call_with_salt.sol | 2 +- .../functionCall/failed_create.sol | 2 +- .../functionCall/send_zero_ether.sol | 2 +- .../inheritance/value_for_constructor.sol | 2 +- .../using_library_mappings_public.sol | 2 +- .../salted_create/salted_create.sol | 2 +- .../salted_create_with_value.sol | 2 +- .../semanticTests/smoke/constructor.sol | 2 +- .../structs/struct_copy_via_local.sol | 2 +- ...truct_delete_storage_with_arrays_small.sol | 2 +- .../struct_memory_to_storage_function_ptr.sol | 2 +- .../semanticTests/structs/structs.sol | 2 +- .../calldata_to_storage.sol | 2 +- .../memory_to_storage.sol | 2 +- .../various/contract_binary_dependencies.sol | 2 +- test/libyul/YulOptimizerTestCommon.cpp | 10 + .../fullSuite/extcodelength.yul | 40 ++ .../yulOptimizerTests/fullSuite/medium.yul | 8 +- ...remove_redundant_assignments_in_switch.yul | 1 - .../fullSuite/stack_compressor_msize.yul | 2 +- .../static_array_slot_computation.yul | 1 - .../yulOptimizerTests/fullSuite/storage.yul | 1 - .../unusedFunctionParameterPruner.yul | 1 - .../unusedFunctionParameterPruner_loop.yul | 4 +- ...nusedFunctionParameterPruner_recursion.yul | 1 - .../unusedFunctionParameterPruner_return.yul | 2 - .../unusedFunctionParameterPruner_simple.yul | 4 +- .../call_does_not_need_to_write.yul | 24 ++ .../covering_calldatacopy.yul | 59 +++ .../covering_calldatacopy_fixed.yul | 53 +++ .../unusedStoreEliminator/create.yul | 17 + .../create_inside_function.yul | 22 + .../unusedStoreEliminator/function_end.yul | 20 + .../function_side_effects.yul | 55 +++ .../function_side_effects_2.yul | 28 ++ .../if_overwrite_all_branches.yul | 20 + .../unusedStoreEliminator/leave.yul | 23 ++ .../unusedStoreEliminator/memoryguard.yul | 24 ++ .../unusedStoreEliminator/mload.yul | 20 + .../no_storage_inside_function.yul | 27 ++ .../unusedStoreEliminator/overflow.yul | 18 + .../unusedStoreEliminator/overlapping.yul | 21 + .../overlapping_small.yul | 27 ++ .../remove_before_revert.yul | 21 + .../unaligned_access.yul | 17 + .../unusedStoreEliminator/unknown_length2.yul | 33 ++ .../unrelated_relative.yul | 23 ++ .../write_before_recursion.yul | 27 ++ test/yulPhaser/Chromosome.cpp | 2 +- 86 files changed, 1274 insertions(+), 159 deletions(-) create mode 100644 libyul/optimiser/UnusedStoreEliminator.cpp create mode 100644 libyul/optimiser/UnusedStoreEliminator.h create mode 100644 test/formal/redundant_store_unrelated.py create mode 100644 test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul diff --git a/Changelog.md b/Changelog.md index 1b512d3e9..8b9fa530c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ Language Features: Compiler Features: * JSON-AST: Added selector field for errors and events. * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump. + * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from. Bugfixes: * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``. diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp index 8a1266bcf..acbcaa5c0 100644 --- a/libevmasm/SemanticInformation.cpp +++ b/libevmasm/SemanticInformation.cpp @@ -121,7 +121,9 @@ vector SemanticInformation::readWriteOperations( Location::Memory, Effect::Write, paramCount - 2, - paramCount - 1, + // Length is in paramCount - 1, but it is only a max length, + // there is no guarantee that the full area is written to. + {}, {} }); return operations; diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h index e1c35e9ea..e233048c1 100644 --- a/libsolidity/interface/OptimiserSettings.h +++ b/libsolidity/interface/OptimiserSettings.h @@ -55,7 +55,7 @@ struct OptimiserSettings "xa[rul]" // Prune a bit more in SSA "xa[r]cL" // Turn into SSA again and simplify "gvif" // Run full inliner - "CTUca[r]LsTFOtfDnca[r]Iulc" // SSA plus simplify + "CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify "]" "jmul[jul] VcTOcul jmul"; // Make source short and pretty diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt index fde673e3d..806f094fe 100644 --- a/libyul/CMakeLists.txt +++ b/libyul/CMakeLists.txt @@ -179,6 +179,8 @@ add_library(yul optimiser/UnusedAssignEliminator.h optimiser/UnusedStoreBase.cpp optimiser/UnusedStoreBase.h + optimiser/UnusedStoreEliminator.cpp + optimiser/UnusedStoreEliminator.h optimiser/Rematerialiser.cpp optimiser/Rematerialiser.h optimiser/SMTSolver.cpp diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp index 0f2194061..181c9bdcb 100644 --- a/libyul/optimiser/Suite.cpp +++ b/libyul/optimiser/Suite.cpp @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -222,6 +223,7 @@ map> const& OptimiserSuite::allSteps() LoadResolver, LoopInvariantCodeMotion, UnusedAssignEliminator, + UnusedStoreEliminator, ReasoningBasedSimplifier, Rematerialiser, SSAReverser, @@ -264,6 +266,7 @@ map const& OptimiserSuite::stepNameToAbbreviationMap() {LoopInvariantCodeMotion::name, 'M'}, {ReasoningBasedSimplifier::name, 'R'}, {UnusedAssignEliminator::name, 'r'}, + {UnusedStoreEliminator::name, 'S'}, {Rematerialiser::name, 'm'}, {SSAReverser::name, 'V'}, {SSATransform::name, 'a'}, diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp new file mode 100644 index 000000000..e3ff2d77a --- /dev/null +++ b/libyul/optimiser/UnusedStoreEliminator.cpp @@ -0,0 +1,379 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see . +*/ +// SPDX-License-Identifier: GPL-3.0 +/** + * Optimiser component that removes stores to memory and storage slots that are not used + * or overwritten later on. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include + +using namespace std; +using namespace solidity; +using namespace solidity::yul; + +/// Variable names for special constants that can never appear in actual Yul code. +static string const zero{"@ 0"}; +static string const one{"@ 1"}; +static string const thirtyTwo{"@ 32"}; + + +void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast) +{ + map functionSideEffects = SideEffectsPropagator::sideEffects( + _context.dialect, + CallGraphGenerator::callGraph(_ast) + ); + + SSAValueTracker ssaValues; + ssaValues(_ast); + map values; + for (auto const& [name, expression]: ssaValues.values()) + values[name] = AssignedValue{expression, {}}; + Expression const zeroLiteral{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}}; + Expression const oneLiteral{Literal{{}, LiteralKind::Number, YulString{"1"}, {}}}; + Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, YulString{"32"}, {}}}; + values[YulString{zero}] = AssignedValue{&zeroLiteral, {}}; + values[YulString{one}] = AssignedValue{&oneLiteral, {}}; + values[YulString{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}}; + + bool const ignoreMemory = MSizeFinder::containsMSize(_context.dialect, _ast); + UnusedStoreEliminator rse{ + _context.dialect, + functionSideEffects, + ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed(), + values, + ignoreMemory + }; + rse(_ast); + rse.changeUndecidedTo(State::Unused, Location::Memory); + rse.changeUndecidedTo(State::Used, Location::Storage); + rse.scheduleUnusedForDeletion(); + + StatementRemover remover(rse.m_pendingRemovals); + remover(_ast); +} + +void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall) +{ + UnusedStoreBase::operator()(_functionCall); + + for (Operation const& op: operationsFromFunctionCall(_functionCall)) + applyOperation(op); + + ControlFlowSideEffects sideEffects; + if (auto builtin = m_dialect.builtin(_functionCall.functionName.name)) + sideEffects = builtin->controlFlowSideEffects; + else + sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name); + + if (!sideEffects.canContinue) + { + changeUndecidedTo(State::Unused, Location::Memory); + changeUndecidedTo(sideEffects.canTerminate ? State::Used : State::Unused, Location::Storage); + } +} + +void UnusedStoreEliminator::operator()(FunctionDefinition const& _functionDefinition) +{ + ScopedSaveAndRestore storeOperations(m_storeOperations, {}); + UnusedStoreBase::operator()(_functionDefinition); +} + + +void UnusedStoreEliminator::operator()(Leave const&) +{ + changeUndecidedTo(State::Used); +} + +void UnusedStoreEliminator::visit(Statement const& _statement) +{ + using evmasm::Instruction; + + UnusedStoreBase::visit(_statement); + + auto const* exprStatement = get_if(&_statement); + if (!exprStatement) + return; + + FunctionCall const* funCall = get_if(&exprStatement->expression); + yulAssert(funCall); + optional instruction = toEVMInstruction(m_dialect, funCall->functionName.name); + if (!instruction) + return; + + if (!ranges::all_of(funCall->arguments, [](Expression const& _expr) -> bool { + return get_if(&_expr) || get_if(&_expr); + })) + return; + + // We determine if this is a store instruction without additional side-effects + // both by querying a combination of semantic information and by listing the instructions. + // This way the assert below should be triggered on any change. + using evmasm::SemanticInformation; + bool isStorageWrite = (*instruction == Instruction::SSTORE); + bool isMemoryWrite = + *instruction == Instruction::EXTCODECOPY || + *instruction == Instruction::CODECOPY || + *instruction == Instruction::CALLDATACOPY || + *instruction == Instruction::RETURNDATACOPY || + *instruction == Instruction::MSTORE || + *instruction == Instruction::MSTORE8; + bool isCandidateForRemoval = + SemanticInformation::otherState(*instruction) != SemanticInformation::Write && ( + SemanticInformation::storage(*instruction) == SemanticInformation::Write || + (!m_ignoreMemory && SemanticInformation::memory(*instruction) == SemanticInformation::Write) + ); + yulAssert(isCandidateForRemoval == (isStorageWrite || (!m_ignoreMemory && isMemoryWrite))); + if (isCandidateForRemoval) + { + m_stores[YulString{}].insert({&_statement, State::Undecided}); + vector operations = operationsFromFunctionCall(*funCall); + yulAssert(operations.size() == 1, ""); + m_storeOperations[&_statement] = move(operations.front()); + } +} + +void UnusedStoreEliminator::finalizeFunctionDefinition(FunctionDefinition const&) +{ + changeUndecidedTo(State::Used); + scheduleUnusedForDeletion(); +} + +vector UnusedStoreEliminator::operationsFromFunctionCall( + FunctionCall const& _functionCall +) const +{ + using evmasm::Instruction; + + YulString functionName = _functionCall.functionName.name; + SideEffects sideEffects; + if (BuiltinFunction const* f = m_dialect.builtin(functionName)) + sideEffects = f->sideEffects; + else + sideEffects = m_functionSideEffects.at(functionName); + + optional instruction = toEVMInstruction(m_dialect, functionName); + if (!instruction) + { + vector result; + // Unknown read is worse than unknown write. + if (sideEffects.memory != SideEffects::Effect::None) + result.emplace_back(Operation{Location::Memory, Effect::Read, {}, {}}); + if (sideEffects.storage != SideEffects::Effect::None) + result.emplace_back(Operation{Location::Storage, Effect::Read, {}, {}}); + return result; + } + + using evmasm::SemanticInformation; + + return util::applyMap( + SemanticInformation::readWriteOperations(*instruction), + [&](SemanticInformation::Operation const& _op) -> Operation + { + yulAssert(!(_op.lengthParameter && _op.lengthConstant)); + yulAssert(_op.effect != Effect::None); + Operation ourOp{_op.location, _op.effect, {}, {}}; + if (_op.startParameter) + ourOp.start = identifierNameIfSSA(_functionCall.arguments.at(*_op.startParameter)); + if (_op.lengthParameter) + ourOp.length = identifierNameIfSSA(_functionCall.arguments.at(*_op.lengthParameter)); + if (_op.lengthConstant) + switch (*_op.lengthConstant) + { + case 1: ourOp.length = YulString(one); break; + case 32: ourOp.length = YulString(thirtyTwo); break; + default: yulAssert(false); + } + return ourOp; + } + ); +} + +void UnusedStoreEliminator::applyOperation(UnusedStoreEliminator::Operation const& _operation) +{ + for (auto& [statement, state]: m_stores[YulString{}]) + if (state == State::Undecided) + { + Operation const& storeOperation = m_storeOperations.at(statement); + if (_operation.effect == Effect::Read && !knownUnrelated(storeOperation, _operation)) + state = State::Used; + else if (_operation.effect == Effect::Write && knownCovered(storeOperation, _operation)) + state = State::Unused; + } +} + +bool UnusedStoreEliminator::knownUnrelated( + UnusedStoreEliminator::Operation const& _op1, + UnusedStoreEliminator::Operation const& _op2 +) const +{ + KnowledgeBase knowledge(m_dialect, m_ssaValues); + + if (_op1.location != _op2.location) + return true; + if (_op1.location == Location::Storage) + { + if (_op1.start && _op2.start) + { + yulAssert( + _op1.length && + _op2.length && + knowledge.valueIfKnownConstant(*_op1.length) == 1 && + knowledge.valueIfKnownConstant(*_op2.length) == 1 + ); + return knowledge.knownToBeDifferent(*_op1.start, *_op2.start); + } + } + else + { + yulAssert(_op1.location == Location::Memory, ""); + if ( + (_op1.length && knowledge.knownToBeZero(*_op1.length)) || + (_op2.length && knowledge.knownToBeZero(*_op2.length)) + ) + return true; + + if (_op1.start && _op1.length && _op2.start) + { + optional length1 = knowledge.valueIfKnownConstant(*_op1.length); + optional start1 = knowledge.valueIfKnownConstant(*_op1.start); + optional start2 = knowledge.valueIfKnownConstant(*_op2.start); + if ( + (length1 && start1 && start2) && + *start1 + *length1 >= *start1 && // no overflow + *start1 + *length1 <= *start2 + ) + return true; + } + if (_op2.start && _op2.length && _op1.start) + { + optional length2 = knowledge.valueIfKnownConstant(*_op2.length); + optional start2 = knowledge.valueIfKnownConstant(*_op2.start); + optional start1 = knowledge.valueIfKnownConstant(*_op1.start); + if ( + (length2 && start2 && start1) && + *start2 + *length2 >= *start2 && // no overflow + *start2 + *length2 <= *start1 + ) + return true; + } + + if (_op1.start && _op1.length && _op2.start && _op2.length) + { + optional length1 = knowledge.valueIfKnownConstant(*_op1.length); + optional length2 = knowledge.valueIfKnownConstant(*_op2.length); + if ( + (length1 && *length1 <= 32) && + (length2 && *length2 <= 32) && + knowledge.knownToBeDifferentByAtLeast32(*_op1.start, *_op2.start) + ) + return true; + } + } + + return false; +} + +bool UnusedStoreEliminator::knownCovered( + UnusedStoreEliminator::Operation const& _covered, + UnusedStoreEliminator::Operation const& _covering +) const +{ + if (_covered.location != _covering.location) + return false; + if ( + (_covered.start && _covered.start == _covering.start) && + (_covered.length && _covered.length == _covering.length) + ) + return true; + if (_covered.location == Location::Memory) + { + KnowledgeBase knowledge(m_dialect, m_ssaValues); + + if (_covered.length && knowledge.knownToBeZero(*_covered.length)) + return true; + + // Condition (i = cover_i_ng, e = cover_e_d): + // i.start <= e.start && e.start + e.length <= i.start + i.length + if (!_covered.start || !_covering.start || !_covered.length || !_covering.length) + return false; + optional coveredLength = knowledge.valueIfKnownConstant(*_covered.length); + optional coveringLength = knowledge.valueIfKnownConstant(*_covering.length); + if (knowledge.knownToBeEqual(*_covered.start, *_covering.start)) + if (coveredLength && coveringLength && *coveredLength <= *coveringLength) + return true; + optional coveredStart = knowledge.valueIfKnownConstant(*_covered.start); + optional coveringStart = knowledge.valueIfKnownConstant(*_covering.start); + if (coveredStart && coveringStart && coveredLength && coveringLength) + if ( + *coveringStart <= *coveredStart && + *coveringStart + *coveringLength >= *coveringStart && // no overflow + *coveredStart + *coveredLength >= *coveredStart && // no overflow + *coveredStart + *coveredLength <= *coveringStart + *coveringLength + ) + return true; + + // TODO for this we probably need a non-overflow assumption as above. + // Condition (i = cover_i_ng, e = cover_e_d): + // i.start <= e.start && e.start + e.length <= i.start + i.length + } + return false; +} + +void UnusedStoreEliminator::changeUndecidedTo( + State _newState, + optional _onlyLocation) +{ + for (auto& [statement, state]: m_stores[YulString{}]) + if ( + state == State::Undecided && + (_onlyLocation == nullopt || *_onlyLocation == m_storeOperations.at(statement).location) + ) + state = _newState; +} + +optional UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const +{ + if (Identifier const* identifier = get_if(&_expression)) + if (m_ssaValues.count(identifier->name)) + return {identifier->name}; + return nullopt; +} + +void UnusedStoreEliminator::scheduleUnusedForDeletion() +{ + for (auto const& [statement, state]: m_stores[YulString{}]) + if (state == State::Unused) + m_pendingRemovals.insert(statement); +} diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h new file mode 100644 index 000000000..dc3065e45 --- /dev/null +++ b/libyul/optimiser/UnusedStoreEliminator.h @@ -0,0 +1,119 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see . +*/ +// SPDX-License-Identifier: GPL-3.0 +/** + * Optimiser component that removes stores to memory and storage slots that are not used + * or overwritten later on. + */ + +#pragma once + +#include +#include +#include +#include +#include + +#include + +#include +#include + +namespace solidity::yul +{ +struct Dialect; +struct AssignedValue; + +/** + * Optimizer component that removes sstore statements if they + * are overwritten in all code paths or never read from. + * + * The m_store member of UnusedStoreBase is only used with the empty yul string + * as key in the first dimension. + * + * Best run in SSA form. + * + * Prerequisite: Disambiguator, ForLoopInitRewriter. + */ +class UnusedStoreEliminator: public UnusedStoreBase +{ +public: + static constexpr char const* name{"UnusedStoreEliminator"}; + static void run(OptimiserStepContext& _context, Block& _ast); + + explicit UnusedStoreEliminator( + Dialect const& _dialect, + std::map const& _functionSideEffects, + std::map _controlFlowSideEffects, + std::map const& _ssaValues, + bool _ignoreMemory + ): + UnusedStoreBase(_dialect), + m_ignoreMemory(_ignoreMemory), + m_functionSideEffects(_functionSideEffects), + m_controlFlowSideEffects(_controlFlowSideEffects), + m_ssaValues(_ssaValues) + {} + + using UnusedStoreBase::operator(); + void operator()(FunctionCall const& _functionCall) override; + void operator()(FunctionDefinition const&) override; + void operator()(Leave const&) override; + + using UnusedStoreBase::visit; + void visit(Statement const& _statement) override; + + using Location = evmasm::SemanticInformation::Location; + using Effect = evmasm::SemanticInformation::Effect; + struct Operation + { + Location location; + Effect effect; + /// Start of affected area. Unknown if not provided. + std::optional start; + /// Length of affected area, unknown if not provided. + /// Unused for storage. + std::optional length; + }; + +private: + void shortcutNestedLoop(TrackedStores const&) override + { + // We might only need to do this for newly introduced stores in the loop. + changeUndecidedTo(State::Used); + } + void finalizeFunctionDefinition(FunctionDefinition const&) override; + + std::vector operationsFromFunctionCall(FunctionCall const& _functionCall) const; + void applyOperation(Operation const& _operation); + bool knownUnrelated(Operation const& _op1, Operation const& _op2) const; + bool knownCovered(Operation const& _covered, Operation const& _covering) const; + + void changeUndecidedTo(State _newState, std::optional _onlyLocation = std::nullopt); + void scheduleUnusedForDeletion(); + + std::optional identifierNameIfSSA(Expression const& _expression) const; + + bool const m_ignoreMemory; + std::map const& m_functionSideEffects; + std::map m_controlFlowSideEffects; + std::map const& m_ssaValues; + + std::map m_storeOperations; +}; + +} diff --git a/test/cmdlineTests/constant_optimizer_yul/output b/test/cmdlineTests/constant_optimizer_yul/output index 2a769811a..ae0b7a0f6 100644 --- a/test/cmdlineTests/constant_optimizer_yul/output +++ b/test/cmdlineTests/constant_optimizer_yul/output @@ -27,7 +27,6 @@ object "C_12" { code { { /// @src 0:61:418 "contract C {..." - mstore(64, memoryguard(0x80)) if callvalue() { revert(0, 0) } /// @src 0:279:410 "assembly {..." sstore(0, 0x1000000000000000000000000000000000000000000000) diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output index 7775ff69c..3b0e1d3ba 100644 --- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output +++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output @@ -201,16 +201,14 @@ object "C_6" { code { { /// @src 0:60:101 "contract C {..." - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output index 35f680d92..94d748169 100644 --- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output +++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output @@ -200,16 +200,14 @@ object "C_6" { code { { /// @src 0:60:101 - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output index 93fad0421..706b8f773 100644 --- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output +++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output @@ -189,16 +189,14 @@ object "C_6" { object "C_6_deployed" { code { { - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output index 82a74384e..1408b6021 100644 --- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output +++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output @@ -95,7 +95,6 @@ object "C_2" { code { { /// @src 0:265:278 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } @@ -559,7 +558,6 @@ object "D_27" { code { { /// @src 0:265:278 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output index 330e208f4..5246a50ee 100644 --- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output +++ b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output @@ -24,7 +24,6 @@ object "C_7" { code { { /// @src 0:82:117 "contract C {..." - mstore(64, memoryguard(0x80)) revert(0, 0) } } @@ -58,7 +57,6 @@ object "D_10" { code { { /// @src 0:118:137 "contract D is C {..." - mstore(64, memoryguard(0x80)) revert(0, 0) } } diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output index fbedf38db..80d90aac5 100644 --- a/test/cmdlineTests/ir_compiler_subobjects/output +++ b/test/cmdlineTests/ir_compiler_subobjects/output @@ -24,7 +24,6 @@ object "C_3" { code { { /// @src 0:82:95 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } @@ -110,7 +109,6 @@ object "D_16" { code { { /// @src 0:82:95 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output index d9b769a12..90c7ddf65 100644 --- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output +++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output @@ -11,11 +11,7 @@ object "D_12" { code { { /// @src 0:82:175 "contract D {..." - mstore(64, 128) if callvalue() { revert(0, 0) } - /// @src 0:115:139 "assembly { mstore(0,0) }" - mstore(0, 0) - /// @src 0:82:175 "contract D {..." let _1 := datasize("D_12_deployed") codecopy(128, dataoffset("D_12_deployed"), _1) return(128, _1) @@ -26,16 +22,14 @@ object "D_12" { code { { /// @src 0:82:175 "contract D {..." - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output index 9a07c7861..7738519c4 100644 --- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output +++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output @@ -24,7 +24,6 @@ object "D_8" { code { { /// @src 0:82:166 "contract D {..." - mstore(64, 128) if iszero(lt(calldatasize(), 4)) { let _1 := 0 @@ -32,8 +31,6 @@ object "D_8" { { if callvalue() { revert(_1, _1) } if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } - /// @src 0:134:158 "assembly { mstore(0,0) }" - mstore(/** @src 0:82:166 "contract D {..." */ _1, _1) return(128, _1) } } diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/output b/test/cmdlineTests/keccak_optimization_deploy_code/output index 4abb046f6..b70a029fc 100644 --- a/test/cmdlineTests/keccak_optimization_deploy_code/output +++ b/test/cmdlineTests/keccak_optimization_deploy_code/output @@ -11,7 +11,6 @@ object "C_12" { code { { /// @src 0:62:463 "contract C {..." - mstore(64, 128) if callvalue() { revert(0, 0) } /// @src 0:103:275 "assembly {..." mstore(0, 100) @@ -27,10 +26,8 @@ object "C_12" { code { { /// @src 0:62:463 "contract C {..." - mstore(64, 128) if callvalue() { revert(0, 0) } /// @src 0:317:454 "assembly {..." - mstore(0, 100) sstore(0, 17385872270140913825666367956517731270094621555228275961425792378517567244498) /// @src 0:62:463 "contract C {..." stop() diff --git a/test/cmdlineTests/keccak_optimization_low_runs/output b/test/cmdlineTests/keccak_optimization_low_runs/output index f5df14027..691e37145 100644 --- a/test/cmdlineTests/keccak_optimization_low_runs/output +++ b/test/cmdlineTests/keccak_optimization_low_runs/output @@ -24,7 +24,6 @@ object "C_7" { code { { /// @src 0:62:285 "contract C {..." - mstore(64, 128) if callvalue() { revert(0, 0) } /// @src 0:109:277 "assembly {..." mstore(0, 100) diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json index 238934a3f..f7d61a7b1 100644 --- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json +++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json @@ -1,8 +1,5 @@ {"contracts":{"C":{"C":{"evm":{"assembly":" /* \"C\":79:428 contract C... */ 0xa0 - dup1 - 0x40 - mstore jumpi(tag_6, callvalue) 0x1f bytecodeSize @@ -438,9 +435,6 @@ sub_0: assembly { } "}}},"D":{"D":{"evm":{"assembly":" /* \"D\":91:166 contract D is C(3)... */ 0xa0 - dup1 - 0x40 - mstore jumpi(tag_6, callvalue) 0x1f bytecodeSize @@ -514,13 +508,8 @@ tag_4: tag_1: /* \"C\":147:149 42 */ mstore(0x80, 0x2a) - /* \"D\":107:108 3 */ - 0x03 - /* \"C\":203:219 stateVar = _init */ - 0x00 - /* \"D\":91:166 contract D is C(3)... */ - sstore sub(shl(0xff, 0x01), 0x04) + /* \"D\":91:166 contract D is C(3)... */ dup2 sgt 0x01 @@ -531,9 +520,7 @@ tag_1: 0x03 /* \"D\":91:166 contract D is C(3)... */ add - /* \"C\":203:219 stateVar = _init */ 0x00 - /* \"D\":91:166 contract D is C(3)... */ sstore /* \"D\":113:164 constructor(int _init2)... */ jump\t// out @@ -541,17 +528,9 @@ tag_1: tag_9: pop pop - shl(0xe0, 0x4e487b71) - /* \"C\":203:219 stateVar = _init */ - 0x00 - /* \"D\":91:166 contract D is C(3)... */ - mstore + mstore(0x00, shl(0xe0, 0x4e487b71)) mstore(0x04, 0x11) - 0x24 - /* \"C\":203:219 stateVar = _init */ - 0x00 - /* \"D\":91:166 contract D is C(3)... */ - revert + revert(0x00, 0x24) stop sub_0: assembly { diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json index 16236251d..44c143b71 100644 --- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json +++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json @@ -206,16 +206,14 @@ object \"C_6\" { code { { /// @src 0:60:101 \"contract C {...\" - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json index d017c8e9c..8dad4c42e 100644 --- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json +++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json @@ -205,16 +205,14 @@ object \"C_6\" { code { { /// @src 0:60:101 - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json index afe07fad9..1675f7ec5 100644 --- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json +++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json @@ -194,16 +194,14 @@ object \"C_6\" { object \"C_6_deployed\" { code { { - let _1 := memoryguard(0x80) - mstore(64, _1) if iszero(lt(calldatasize(), 4)) { - let _2 := 0 - if eq(0x26121ff0, shr(224, calldataload(_2))) + let _1 := 0 + if eq(0x26121ff0, shr(224, calldataload(_1))) { - if callvalue() { revert(_2, _2) } - if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } - return(_1, _2) + if callvalue() { revert(_1, _1) } + if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) } + return(memoryguard(0x80), _1) } } revert(0, 0) diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json index f593301bc..f21722a63 100644 --- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json +++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json @@ -622,7 +622,6 @@ object \"C_54\" { { /// @src 0:79:435 \"contract C...\" let _1 := memoryguard(0xa0) - mstore(64, _1) if callvalue() { revert(0, 0) } let programSize := datasize(\"C_54\") let argSize := sub(codesize(), programSize) @@ -1469,7 +1468,6 @@ object \"D_72\" { { /// @src 1:91:166 \"contract D is C(3)...\" let _1 := memoryguard(0xa0) - mstore(64, _1) if callvalue() { revert(0, 0) } let programSize := datasize(\"D_72\") let argSize := sub(codesize(), programSize) @@ -1500,15 +1498,13 @@ object \"D_72\" { /// @src 0:154:156 \"42\" mstore(128, 0x2a) /// @src 1:91:166 \"contract D is C(3)...\" - sstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:107:108 \"3\" */ 0x03) - /// @src 1:91:166 \"contract D is C(3)...\" if and(1, sgt(var_init2, sub(shl(255, 1), 4))) { - mstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71)) + mstore(0, shl(224, 0x4e487b71)) mstore(4, 0x11) - revert(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24) + revert(0, 0x24) } - sstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:91:166 \"contract D is C(3)...\" */ add(/** @src 1:107:108 \"3\" */ 0x03, /** @src 1:91:166 \"contract D is C(3)...\" */ var_init2)) + sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ add(/** @src 1:107:108 \"3\" */ 0x03, /** @src 1:91:166 \"contract D is C(3)...\" */ var_init2)) } } /// @use-src 0:\"C\", 1:\"D\" diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output index 8b5666b37..7dec204b1 100644 --- a/test/cmdlineTests/viair_subobject_optimization/output +++ b/test/cmdlineTests/viair_subobject_optimization/output @@ -3,9 +3,6 @@ EVM assembly: /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ 0x80 - dup1 - 0x40 - mstore jumpi(tag_6, callvalue) 0x1f bytecodeSize @@ -86,7 +83,6 @@ stop sub_0: assembly { /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ - mstore(0x40, 0x80) 0x00 dup1 revert @@ -120,9 +116,6 @@ stop sub_0: assembly { /* "viair_subobject_optimization/input.sol":669:772 contract D {... */ 0x80 - dup1 - 0x40 - mstore jumpi(tag_2, iszero(lt(calldatasize, 0x04))) tag_3: pop @@ -283,9 +276,6 @@ sub_0: assembly { sub_0: assembly { /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ 0x80 - dup1 - 0x40 - mstore jumpi(tag_6, callvalue) 0x1f bytecodeSize @@ -366,7 +356,6 @@ sub_0: assembly { sub_0: assembly { /* "viair_subobject_optimization/input.sol":61:668 contract C {... */ - mstore(0x40, 0x80) 0x00 dup1 revert diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output index 4b388665c..aea2013ec 100644 --- a/test/cmdlineTests/viair_subobjects/output +++ b/test/cmdlineTests/viair_subobjects/output @@ -30,7 +30,6 @@ object "C_3" { code { { /// @src 0:82:95 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } @@ -122,7 +121,6 @@ object "D_16" { code { { /// @src 0:82:95 "contract C {}" - mstore(64, memoryguard(0x80)) revert(0, 0) } } diff --git a/test/formal/redundant_store_unrelated.py b/test/formal/redundant_store_unrelated.py new file mode 100644 index 000000000..2961d0099 --- /dev/null +++ b/test/formal/redundant_store_unrelated.py @@ -0,0 +1,63 @@ +import sys +from z3 import Solver, Int, unsat + +""" +Tests that the conditions inside RedundantStoreEliminator::knownUnrelated +only return "unrelated" incorrectly if one of the operation reverts +due to large memory access. +""" + +n_bits = 256 + +solver = Solver() +solver.set("timeout", 60000) + +def restrict(x): + solver.add(x >= 0) + solver.add(x < 2**n_bits) + +def restrictedInt(x): + var = Int(x) + restrict(var) + return var + +start1 = restrictedInt('start1') +length1 = restrictedInt('length1') +start2 = restrictedInt('start2') +length2 = restrictedInt('length2') + +k = Int('k') +diff = Int('diff') +solver.add(diff == start2 - start1 + k * 2**n_bits) +restrict(diff) +# diff is the result of sub(start2, start1) in EVM + +# These are the conditions in the code. +solver.add(diff >= length1) +solver.add(diff <= 2**(n_bits-1)) + +# We check that the two conditions are conflicting: +# - overlap +# - start1 is small + +# Overlap: +# x is a potential point where the memory operations +# overlap. +# Note that we do not use wrapping arithmetic +# here, because it is not done in the EVM either. +# For example calldatacopy(2**256 - 2, 0, 10) +# (copy 10 bytes from calldata position zero to memory +# position 2**256 - 2) would not write to memory position +# zero either. +x = Int('x') +solver.add(start1 <= x) +solver.add(x < start1 + length1) +solver.add(start2 <= x) +solver.add(x < start2 + length2) + +# start1 is "small": +solver.add(start1 < 2**(n_bits-1)) + +if solver.check() != unsat: + print("Expected unsat but got something else") + sys.exit(1) diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol index b4b392974..6eb0de421 100644 --- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol +++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol @@ -17,7 +17,7 @@ contract c { // ---- // setData1(uint256,uint256,uint256): 10, 5, 4 -> // copyStorageStorage() -> -// gas irOptimized: 111406 +// gas irOptimized: 111397 // gas legacy: 109278 // gas legacyOptimized: 109268 // getData2(uint256): 5 -> 10, 4 diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol index 87c238206..b7b8e4be2 100644 --- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol +++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol @@ -48,6 +48,6 @@ contract C { // compileViaYul: also // ---- // f() -> 0xff -// gas irOptimized: 121145 +// gas irOptimized: 121125 // gas legacy: 128005 // gas legacyOptimized: 123446 diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol index 82c8d6b6c..8d0f6358e 100644 --- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol +++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol @@ -16,4 +16,4 @@ contract C { // compileViaYul: also // ---- // f() -> 0, 0, 0 -// gas irOptimized: 91098 +// gas irOptimized: 90992 diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol index d2358b1e2..1550df0d4 100644 --- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol +++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol @@ -19,5 +19,5 @@ contract c { // test() -> // gas irOptimized: 142640 // gas legacy: 164430 -// gas legacyOptimized: 158513 +// gas legacyOptimized: 157898 // storageEmpty -> 1 diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol index 7a05b5328..d783be0b2 100644 --- a/test/libsolidity/semanticTests/array/reusing_memory.sol +++ b/test/libsolidity/semanticTests/array/reusing_memory.sol @@ -26,6 +26,6 @@ contract Main { // compileViaYul: also // ---- // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1 -// gas irOptimized: 113613 +// gas irOptimized: 113604 // gas legacy: 126596 // gas legacyOptimized: 113823 diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol index bb9567dd0..1fa468869 100644 --- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol +++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol @@ -19,7 +19,7 @@ contract Main { // compileViaYul: also // ---- // constructor(): "abc", true -// gas irOptimized: 106267 +// gas irOptimized: 106221 // gas legacy: 145838 // gas legacyOptimized: 104017 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol index 1352c6e1c..e50901945 100644 --- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol +++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol @@ -19,6 +19,6 @@ contract C { // compileViaYul: also // ---- // f(), 2000 ether -> true -// gas irOptimized: 123036 +// gas irOptimized: 120036 // gas legacy: 123226 // gas legacyOptimized: 123092 diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol index 0b8982d40..21738240a 100644 --- a/test/libsolidity/semanticTests/constructor_with_params.sol +++ b/test/libsolidity/semanticTests/constructor_with_params.sol @@ -11,7 +11,7 @@ contract C { // compileViaYul: also // ---- // constructor(): 2, 0 -> -// gas irOptimized: 103363 +// gas irOptimized: 103290 // gas legacy: 117158 // i() -> 2 // k() -> 0 diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol index 8f891116e..635a60c01 100644 --- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol +++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol @@ -23,7 +23,7 @@ contract D is B, C { // compileViaYul: also // ---- // constructor(): 2, 0 -> -// gas irOptimized: 160166 +// gas irOptimized: 160093 // gas legacy: 170665 // gas legacyOptimized: 145396 // i() -> 2 diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol index 9f33757b1..2d8b667ef 100644 --- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol +++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol @@ -14,7 +14,7 @@ contract D is C { // compileViaYul: also // ---- // constructor(): 2, 0 -> -// gas irOptimized: 123980 +// gas irOptimized: 123907 // gas legacy: 139250 // gas legacyOptimized: 119367 // i() -> 2 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol index 0b9407814..a67b1b5ad 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol @@ -17,7 +17,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 203982 +// gas irOptimized: 203909 // gas legacy: 245842 // gas legacyOptimized: 195676 // f() -> 2 diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol index a4796ac82..b03734532 100644 --- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol +++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol @@ -18,7 +18,7 @@ contract D { // compileViaYul: also // ---- // constructor(): 2 -> -// gas irOptimized: 204145 +// gas irOptimized: 204072 // gas legacy: 246202 // gas legacyOptimized: 195914 // f() -> 2 diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol index 639f39945..933bf342d 100644 --- a/test/libsolidity/semanticTests/functionCall/failed_create.sol +++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol @@ -18,7 +18,7 @@ contract C { // compileViaYul: also // ---- // constructor(), 20 wei -// gas irOptimized: 219069 +// gas irOptimized: 216903 // gas legacy: 294335 // gas legacyOptimized: 174279 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179 diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol index 617a6dec2..1524c46d0 100644 --- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol +++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol @@ -19,7 +19,7 @@ contract Main { // compileViaYul: also // ---- // constructor(), 20 wei -> -// gas irOptimized: 102862 +// gas irOptimized: 101782 // gas legacy: 116691 // gas legacyOptimized: 100361 // s() -> true diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol index 52ed2bc76..354e5d82b 100644 --- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol +++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol @@ -42,7 +42,7 @@ contract Main { // compileViaYul: also // ---- // constructor(), 22 wei -> -// gas irOptimized: 282981 +// gas irOptimized: 282916 // gas legacy: 402045 // gas legacyOptimized: 266772 // getFlag() -> true diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol index e8d22c279..60741d4c4 100644 --- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol +++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol @@ -22,6 +22,6 @@ contract Test { // ---- // library: Lib // f() -> 1, 0, 0x2a, 0x17, 0, 0x63 -// gas irOptimized: 119561 +// gas irOptimized: 119501 // gas legacy: 124793 // gas legacyOptimized: 119694 diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol index 5374d2352..51b987c2c 100644 --- a/test/libsolidity/semanticTests/salted_create/salted_create.sol +++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol @@ -22,6 +22,6 @@ contract A { // ---- // different_salt() -> true // same_salt() -> true -// gas irOptimized: 98438914 +// gas irOptimized: 98438898 // gas legacy: 98439116 // gas legacyOptimized: 98438970 diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol index 780cc32b8..aab46a9a4 100644 --- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol +++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol @@ -22,6 +22,6 @@ contract A { // compileViaYul: also // ---- // f(), 10 ether -> 3007, 3008, 3009 -// gas irOptimized: 272467 +// gas irOptimized: 272431 // gas legacy: 422501 // gas legacyOptimized: 287472 diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol index a6e812e9a..44d7d502f 100644 --- a/test/libsolidity/semanticTests/smoke/constructor.sol +++ b/test/libsolidity/semanticTests/smoke/constructor.sol @@ -14,7 +14,7 @@ contract C { // compileViaYul: also // ---- // constructor(), 2 wei: 3 -> -// gas irOptimized: 111699 +// gas irOptimized: 111607 // gas legacy: 151416 // gas legacyOptimized: 108388 // state() -> 3 diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol index 21757ea40..4305687b7 100644 --- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol +++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol @@ -21,6 +21,6 @@ contract c { // compileViaYul: also // ---- // test() -> true -// gas irOptimized: 110186 +// gas irOptimized: 110177 // gas legacy: 110627 // gas legacyOptimized: 109706 diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol index 6f88df394..abc10d8aa 100644 --- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol +++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol @@ -27,4 +27,4 @@ contract C { // compileViaYul: true // ---- // f() -> 0 -// gas irOptimized: 111896 +// gas irOptimized: 112129 diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol index fe791a68d..936039f5e 100644 --- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol +++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol @@ -32,6 +32,6 @@ contract C { // compileViaYul: also // ---- // f() -> 42, 23, 34, 42, 42 -// gas irOptimized: 110966 +// gas irOptimized: 110845 // gas legacy: 112021 // gas legacyOptimized: 110548 diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol index 3356eac16..412b71d39 100644 --- a/test/libsolidity/semanticTests/structs/structs.sol +++ b/test/libsolidity/semanticTests/structs/structs.sol @@ -32,7 +32,7 @@ contract test { // ---- // check() -> false // set() -> -// gas irOptimized: 134432 +// gas irOptimized: 134411 // gas legacy: 135277 // gas legacyOptimized: 134064 // check() -> true diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol index 433d1969c..0305fd473 100644 --- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol +++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol @@ -25,7 +25,7 @@ contract C { // ---- // s() -> 0, 0, 0x00, 0 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 -> -// gas irOptimized: 44786 +// gas irOptimized: 44405 // gas legacy: 47200 // gas legacyOptimized: 44923 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15 diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol index 04e993682..b250bea87 100644 --- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol +++ b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol @@ -25,7 +25,7 @@ contract C { // ---- // s() -> 0, 0, 0x00, 0 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 -> -// gas irOptimized: 44536 +// gas irOptimized: 44473 // gas legacy: 46213 // gas legacyOptimized: 44671 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15 diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol index 57942979a..806138562 100644 --- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol +++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol @@ -21,4 +21,4 @@ contract C { // compileViaYul: also // ---- // constructor() -> -// gas irOptimized: 104337 +// gas irOptimized: 102813 diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp index e7711f586..60826665a 100644 --- a/test/libyul/YulOptimizerTestCommon.cpp +++ b/test/libyul/YulOptimizerTestCommon.cpp @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -237,6 +238,15 @@ YulOptimizerTestCommon::YulOptimizerTestCommon( ForLoopInitRewriter::run(*m_context, *m_ast); UnusedAssignEliminator::run(*m_context, *m_ast); }}, + {"unusedStoreEliminator", [&]() { + disambiguate(); + ForLoopInitRewriter::run(*m_context, *m_ast); + ExpressionSplitter::run(*m_context, *m_ast); + SSATransform::run(*m_context, *m_ast); + UnusedStoreEliminator::run(*m_context, *m_ast); + SSAReverser::run(*m_context, *m_ast); + ExpressionJoiner::run(*m_context, *m_ast); + }}, {"equalStoreEliminator", [&]() { disambiguate(); FunctionHoister::run(*m_context, *m_ast); diff --git a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul new file mode 100644 index 000000000..436f5d5fa --- /dev/null +++ b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul @@ -0,0 +1,40 @@ +{ + let _1 := 0 + let value := calldataload(4) + if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(_1, _1) } + let length := extcodesize(value) + let _2 := 0xffffffffffffffff + if gt(length, _2) { revert(0, 0) } + let _3 := not(31) + let memPtr := mload(64) + let newFreePtr := add(memPtr, and(add(and(add(length, 31), _3), 63), _3)) + if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { revert(0, 0) } + mstore(64, newFreePtr) + mstore(memPtr, length) + + // We aim to optimize this out. + extcodecopy(value, add(memPtr, 32), _1, length) + sstore(_1, mload(memPtr)) +} +// ==== +// EVMVersion: >byzantium +// ---- +// step: fullSuite +// +// { +// { +// let value := calldataload(4) +// if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) } +// let length := extcodesize(value) +// let _1 := 0xffffffffffffffff +// if gt(length, _1) { revert(0, 0) } +// let memPtr := mload(64) +// let _2 := not(31) +// let newFreePtr := add(memPtr, and(add(and(add(length, 31), _2), 63), _2)) +// if or(gt(newFreePtr, _1), lt(newFreePtr, memPtr)) { revert(0, 0) } +// mstore(64, newFreePtr) +// mstore(memPtr, length) +// extcodecopy(value, add(memPtr, 32), 0, length) +// sstore(0, mload(memPtr)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/fullSuite/medium.yul b/test/libyul/yulOptimizerTests/fullSuite/medium.yul index 41b77c115..9a6381d79 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/medium.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/medium.yul @@ -23,13 +23,7 @@ // // { // { -// let p := mload(0x40) -// mstore(0x40, add(p, 0x20)) -// mstore(0x40, add(p, 96)) -// let p_1 := add(p, 128) -// mstore(p_1, 2) -// mstore(0x40, 0x20) -// sstore(0, p_1) +// sstore(0, add(mload(0x40), 128)) // sstore(1, 0x20) // } // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul b/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul index a0ac5c36d..317661325 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul @@ -15,6 +15,5 @@ // case 0 { } // case 1 { } // default { invalid() } -// mstore(1, 1) // } // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul index 13683e8e6..75e2ff4c2 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul @@ -52,9 +52,9 @@ // pop(keccak256(gcd(_3, _2), or(gt(not(gcd(_3, _2)), _1), _1))) // mstore(lt(or(gt(_1, or(or(gt(or(or(or(gt(or(gt(_6, _9), _1), _8), _7), _5), _1), _1), _4), _1)), _1), _1), _1) // sstore(not(gcd(_3, _2)), _1) -// sstore(0, 0) // sstore(2, _1) // extcodecopy(_1, msize(), _1, _1) +// sstore(0, 0) // sstore(3, _1) // } // function gcd(_a, _b) -> out diff --git a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul index c5f4aa466..72c09d3dc 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul @@ -39,7 +39,6 @@ // mstore(4, 0x32) // revert(_1, 0x24) // } -// mstore(_1, _1) // sstore(0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56d, 0x05) // } // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/storage.yul b/test/libyul/yulOptimizerTests/fullSuite/storage.yul index 7b3360847..a60b3d348 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/storage.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/storage.yul @@ -8,7 +8,6 @@ // // { // { -// sstore(4, 5) // sstore(4, 3) // sstore(8, 3) // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul index b7f0b4afb..6f82ab27a 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul @@ -20,7 +20,6 @@ // { // { // let out1, out2 := foo(sload(32)) -// sstore(0, out1) // sstore(0, out2) // let out1_1, out2_1 := foo(sload(8)) // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul index ee648f80f..7955ee12e 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul @@ -18,9 +18,9 @@ // { // { // f() +// f() +// f() // sstore(0, 1) -// f() -// f() // } // function f() // { diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul index c3b75e84e..92d251cab 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul @@ -18,7 +18,6 @@ // { // let x, y, z := f() // sstore(0, x) -// sstore(1, y) // sstore(1, z) // } // function f() -> x, y, z diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul index 14f0137cb..b066d998b 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul @@ -22,8 +22,6 @@ // { // { // let out1, out2 := foo(sload(32)) -// sstore(0, out1) -// sstore(0, out2) // sstore(0, 0) // let out1_1, out2_1 := foo(sload(8)) // } diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul index 68620cc96..785840baa 100644 --- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul +++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul @@ -16,9 +16,9 @@ // { // { // f() +// f() +// f() // sstore(0, 1) -// f() -// f() // } // function f() // { diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul new file mode 100644 index 000000000..eeff779f8 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul @@ -0,0 +1,24 @@ +{ + mstore(0, 1) + let x := call( + 0, + 0, + 0, + 0, + 0, + 0, + 0x32 // length is only a max length, so there is no guarantee that the mstore above is overwritten. + ) + sstore(0, mload(0)) +} + +// ---- +// step: unusedStoreEliminator +// +// { +// { +// mstore(0, 1) +// let x := call(0, 0, 0, 0, 0, 0, 0x32) +// sstore(0, mload(0)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul new file mode 100644 index 000000000..7fd227089 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul @@ -0,0 +1,59 @@ +{ + let start := calldataload(0x10) + if calldataload(0) { + // not covered + mstore(add(start, 2), 7) + calldatacopy(start, 0, 0x20) + } + if calldataload(1) { + // covered + mstore(add(start, 2), 9) + calldatacopy(add(start, 1), 0, 0x21) + } + if calldataload(2) { + // covered + mstore8(add(start, 2), 7) + calldatacopy(start, 0, 3) + } + if calldataload(3) { + // not covered + mstore8(add(start, 3), 7) + calldatacopy(start, 0, 3) + } + sstore(0, keccak256(start, 0x40)) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let start := calldataload(0x10) +// if calldataload(0) +// { +// let _4 := 7 +// mstore(add(start, 2), _4) +// calldatacopy(start, 0, 0x20) +// } +// if calldataload(1) +// { +// let _11 := 9 +// mstore(add(start, 2), _11) +// let _14 := 0x21 +// let _15 := 0 +// calldatacopy(add(start, 1), _15, _14) +// } +// if calldataload(2) +// { +// let _20 := 7 +// mstore8(add(start, 2), _20) +// calldatacopy(start, 0, 3) +// } +// if calldataload(3) +// { +// let _27 := 7 +// mstore8(add(start, 3), _27) +// calldatacopy(start, 0, 3) +// } +// sstore(0, keccak256(start, 0x40)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul new file mode 100644 index 000000000..47e0b95fa --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul @@ -0,0 +1,53 @@ +{ + if calldataload(0) { + // not covered + mstore(2, 7) + calldatacopy(0, 0, 0x20) + } + if calldataload(1) { + // covered + mstore(2, 9) + calldatacopy(1, 0, 0x21) + } + if calldataload(2) { + // covered + mstore8(2, 7) + calldatacopy(0, 0, 3) + } + if calldataload(3) { + // not covered + mstore8(3, 7) + calldatacopy(0, 0, 3) + } + sstore(0, keccak256(0, 0x40)) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// if calldataload(0) +// { +// mstore(2, 7) +// calldatacopy(0, 0, 0x20) +// } +// if calldataload(1) +// { +// let _10 := 9 +// let _11 := 2 +// calldatacopy(1, 0, 0x21) +// } +// if calldataload(2) +// { +// let _17 := 7 +// let _18 := 2 +// calldatacopy(0, 0, 3) +// } +// if calldataload(3) +// { +// mstore8(3, 7) +// calldatacopy(0, 0, 3) +// } +// sstore(0, keccak256(0, 0x40)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul new file mode 100644 index 000000000..c3183d9ec --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul @@ -0,0 +1,17 @@ +{ + let x := 5 + sstore(x, 10) + pop(create(0, 0, 0)) + sstore(x, 20) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 5 +// sstore(x, 10) +// pop(create(0, 0, 0)) +// sstore(x, 20) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul new file mode 100644 index 000000000..782c68663 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul @@ -0,0 +1,22 @@ +{ + let x := 5 + function f() { + pop(create(0, 0, 0)) + } + sstore(x, 10) + f() + sstore(x, 20) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 5 +// sstore(x, 10) +// f() +// sstore(x, 20) +// } +// function f() +// { pop(create(0, 0, 0)) } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul new file mode 100644 index 000000000..cb69be363 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul @@ -0,0 +1,20 @@ +{ + function f() { + let x := calldataload(2) + mstore(x, 2) + // This cannot be removed because we do not know what happens after the function. + mstore(x, 3) + } +} +// ---- +// step: unusedStoreEliminator +// +// { +// { } +// function f() +// { +// let x := calldataload(2) +// let _2 := 2 +// mstore(x, 3) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul new file mode 100644 index 000000000..25f9355b3 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul @@ -0,0 +1,55 @@ +{ + function justStop() { return(0, 0) } + function justRevert() { revert(0, 0) } + + let x := 0 + let y := 1 + let a := 0x80 + let b := 7 + let c := 9 + switch calldataload(0) + case 0 + { + sstore(x, y) + mstore(a, b) + justStop() + sstore(x, y) + mstore(a, b) + } + case 1 + { + sstore(x, y) + mstore(a, b) + justRevert() + sstore(x, y) + mstore(a, b) + } +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 0 +// let y := 1 +// let a := 0x80 +// let b := 7 +// let c := 9 +// switch calldataload(0) +// case 0 { +// sstore(x, y) +// mstore(a, b) +// justStop() +// sstore(x, y) +// } +// case 1 { +// mstore(a, b) +// justRevert() +// sstore(x, y) +// } +// } +// function justStop() +// { return(0, 0) } +// function justRevert() +// { revert(0, 0) } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul new file mode 100644 index 000000000..843f7f6e9 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul @@ -0,0 +1,28 @@ +{ + let x := 0 + let y := 1 + sstore(x, y) + f() + sstore(x, y) + function f() { + // prevent inlining + f() + return(0, 0) + } + } +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 0 +// let y := 1 +// f() +// sstore(x, y) +// } +// function f() +// { +// f() +// return(0, 0) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul new file mode 100644 index 000000000..7054dc255 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul @@ -0,0 +1,20 @@ +{ + let c := calldataload(0) + // This store will be overwritten in all branches and thus can be removed. + sstore(c, 1) + if c { + sstore(c, 2) + } + sstore(c, 3) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let c := calldataload(0) +// let _2 := 1 +// if c { let _3 := 2 } +// sstore(c, 3) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul new file mode 100644 index 000000000..92a751554 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul @@ -0,0 +1,23 @@ +{ + function f() { + mstore(0, 5) + if calldataload(0) { leave } + mstore(0x20, 5) + revert(0, 0) + } + f() +} +// ---- +// step: unusedStoreEliminator +// +// { +// { f() } +// function f() +// { +// mstore(0, 5) +// if calldataload(0) { leave } +// let _5 := 5 +// let _6 := 0x20 +// revert(0, 0) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul new file mode 100644 index 000000000..466cd02e5 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul @@ -0,0 +1,24 @@ +{ + mstore(0x40, memoryguard(100)) + let free_mem_ptr := mload(0x40) + // redundant + mstore(free_mem_ptr, 100) + // redundant + mstore8(add(free_mem_ptr, 31), 200) + mstore(free_mem_ptr, 300) + return(free_mem_ptr, add(free_mem_ptr, 100)) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// mstore(0x40, memoryguard(100)) +// let free_mem_ptr := mload(0x40) +// let _4 := 100 +// let _5 := 200 +// mstore8(add(free_mem_ptr, 31), _5) +// mstore(free_mem_ptr, 300) +// return(free_mem_ptr, add(free_mem_ptr, 100)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul new file mode 100644 index 000000000..717332472 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul @@ -0,0 +1,20 @@ +{ + let zero := 0 + mstore(zero, 5) + let x := mload(zero) + mstore(zero, 8) + let y := mload(zero) + sstore(zero, y) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let zero := 0 +// mstore(zero, 5) +// let x := mload(zero) +// mstore(zero, 8) +// sstore(zero, mload(zero)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul new file mode 100644 index 000000000..524b328e9 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul @@ -0,0 +1,27 @@ +{ + function f() -> r { + r := mload(0x20) + } + let x := 5 + sstore(x, 10) // should be removed + mstore(0, 42) // could be removed, but will probably stay? + pop(f()) + sstore(x, 10) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 5 +// let _2 := 10 +// mstore(0, 42) +// pop(f()) +// sstore(x, 10) +// } +// function f() -> r +// { +// r := mload(0x20) +// let r_7 := r +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul new file mode 100644 index 000000000..dda59873c --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul @@ -0,0 +1,18 @@ +{ + let x := 0 + + calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935) + mstore(x, 20) + return(0, 32) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let x := 0 +// calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935) +// mstore(x, 20) +// return(0, 32) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul new file mode 100644 index 000000000..78179dc3e --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul @@ -0,0 +1,21 @@ +{ + let _1 := 0 + if callvalue() { revert(_1, _1) } + mstore(_1, shl(224, 0x4e487b71)) + mstore(4, 0x32) + revert(_1, 0x24) +} +// ==== +// EVMVersion: >=constantinople +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let _1 := 0 +// if callvalue() { revert(_1, _1) } +// mstore(_1, shl(224, 0x4e487b71)) +// mstore(4, 0x32) +// revert(_1, 0x24) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul new file mode 100644 index 000000000..2950a04ce --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul @@ -0,0 +1,27 @@ +{ + let _1 := 0 + let _2 := callvalue() + let _3 := 0x4e487b71 + let _4 := 224 + let _5 := 7 + mstore(_1, _5) + let _6 := 0x32 + let _7 := 4 + mstore(_7, _6) + let _8 := 0x24 + revert(_1, _8) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let _1 := 0 +// let _2 := callvalue() +// let _3 := 0x4e487b71 +// let _4 := 224 +// mstore(_1, 7) +// mstore(4, 0x32) +// revert(_1, 0x24) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul new file mode 100644 index 000000000..e7777964c --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul @@ -0,0 +1,21 @@ +{ + let c := calldataload(0) + mstore(c, 4) + if c { + sstore(c, 2) + } + let d := 0 + revert(d, d) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let c := calldataload(0) +// let _2 := 4 +// if c { let _3 := 2 } +// let d := 0 +// revert(d, d) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul new file mode 100644 index 000000000..3bfd558fe --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul @@ -0,0 +1,17 @@ +{ + let zero := 0 + mstore(zero, 0x1234) + mstore(4, 0x456) + revert(zero, 5) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let zero := 0 +// mstore(zero, 0x1234) +// mstore(4, 0x456) +// revert(zero, 5) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul new file mode 100644 index 000000000..db5f060a6 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul @@ -0,0 +1,33 @@ +{ + let a + switch calldataload(0) + case 0 { a := calldataload(9) } + case 1 { a := calldataload(10) } + + calldatacopy(0x20, 0, a) + let x := mload(0) + sstore(0, x) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let a_9 +// let a := a_9 +// switch calldataload(0) +// case 0 { +// a := calldataload(9) +// let a_10 := a +// } +// case 1 { +// let a_12 := a +// a := calldataload(10) +// let a_11 := a +// } +// let a_13 := a +// let _5 := 0 +// let _6 := 0x20 +// sstore(0, mload(0)) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul new file mode 100644 index 000000000..b0b42060f --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul @@ -0,0 +1,23 @@ +{ + let c := calldataload(0) + mstore(c, 4) + mstore(add(c, 0x20), 8) + sstore(0, mload(c)) + mstore(c, 9) + mstore(add(c, 0x20), 20) +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let c := calldataload(0) +// mstore(c, 4) +// let _3 := 8 +// let _5 := add(c, 0x20) +// sstore(0, mload(c)) +// let _8 := 9 +// let _9 := 20 +// let _11 := add(c, 0x20) +// } +// } diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul new file mode 100644 index 000000000..855ae8325 --- /dev/null +++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul @@ -0,0 +1,27 @@ +{ + sstore(0, 1) + mstore(0, 2) + f() + function f() { + g() + } + function g() { + f() + } +} +// ---- +// step: unusedStoreEliminator +// +// { +// { +// let _1 := 1 +// let _2 := 0 +// let _3 := 2 +// let _4 := 0 +// f() +// } +// function f() +// { g() } +// function g() +// { f() } +// } diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp index 1b1e8bed5..90e278f42 100644 --- a/test/yulPhaser/Chromosome.cpp +++ b/test/yulPhaser/Chromosome.cpp @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin BOOST_TEST(chromosome.length() == allSteps.size()); BOOST_TEST(chromosome.optimisationSteps() == allSteps); - BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpud"); + BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpuSd"); } BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names) From 1653b6c5b72f157537c81e3bef375c026d988c8e Mon Sep 17 00:00:00 2001 From: Tyler Date: Thu, 10 Mar 2022 17:36:46 -0500 Subject: [PATCH 23/58] more qualifying --- libsolidity/ast/ASTAnnotations.h | 2 +- test/CommonSyntaxTest.cpp | 10 ++++------ test/libsolidity/util/TestFileParser.cpp | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h index d7a49b850..3497a2ea8 100644 --- a/libsolidity/ast/ASTAnnotations.h +++ b/libsolidity/ast/ASTAnnotations.h @@ -222,7 +222,7 @@ struct InlineAssemblyAnnotation: StatementAnnotation /// True, if the assembly block was annotated to be memory-safe. bool markedMemorySafe = false; /// True, if the assembly block involves any memory opcode or assigns to variables in memory. - SetOnce hasMemoryEffects; + util::SetOnce hasMemoryEffects; }; struct BlockAnnotation: StatementAnnotation, ScopableAnnotation diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp index d28ec1675..385ada76d 100644 --- a/test/CommonSyntaxTest.cpp +++ b/test/CommonSyntaxTest.cpp @@ -42,11 +42,10 @@ namespace int parseUnsignedInteger(string::iterator& _it, string::iterator _end) { - auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());}; - if (_it == _end || !isDigit(*_it)) + if (_it == _end || !util::isDigit(*_it)) BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected.")); int result = 0; - while (_it != _end && isDigit(*_it)) + while (_it != _end && util::isDigit(*_it)) { result *= 10; result += *_it - '0'; @@ -195,7 +194,6 @@ string CommonSyntaxTest::errorMessage(Exception const& _e) vector CommonSyntaxTest::parseExpectations(istream& _stream) { - auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());}; vector expectations; string line; while (getline(_stream, line)) @@ -215,7 +213,7 @@ vector CommonSyntaxTest::parseExpectations(istream& _stream) skipWhitespace(it, line.end()); optional errorId; - if (it != line.end() && isDigit(*it)) + if (it != line.end() && util::isDigit(*it)) errorId = ErrorId{static_cast(parseUnsignedInteger(it, line.end()))}; expect(it, line.end(), ':'); @@ -228,7 +226,7 @@ vector CommonSyntaxTest::parseExpectations(istream& _stream) if (it != line.end() && *it == '(') { ++it; - if (it != line.end() && !isDigit(*it)) + if (it != line.end() && !util::isDigit(*it)) { auto sourceNameStart = it; while (it != line.end() && *it != ':') diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp index dbaf52604..007106294 100644 --- a/test/libsolidity/util/TestFileParser.cpp +++ b/test/libsolidity/util/TestFileParser.cpp @@ -763,12 +763,11 @@ string TestFileParser::Scanner::scanString() char TestFileParser::Scanner::scanHexPart() { auto toLower = [](char _c) -> char { return tolower(_c, locale::classic()); }; - auto isDigit = [](char _c) -> bool { return isdigit(_c, locale::classic()); }; advance(); // skip 'x' int value{}; - if (isDigit(current())) + if (util::isDigit(current())) value = current() - '0'; else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') value = toLower(current()) - 'a' + 10; @@ -780,7 +779,7 @@ char TestFileParser::Scanner::scanHexPart() return static_cast(value); value <<= 4; - if (isDigit(current())) + if (util::isDigit(current())) value |= current() - '0'; else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') value |= toLower(current()) - 'a' + 10; From 33575674538625cc06fd099a3eb0996d0c81f043 Mon Sep 17 00:00:00 2001 From: Tyler Date: Thu, 10 Mar 2022 18:16:12 -0500 Subject: [PATCH 24/58] Fix CommonSyntaxTest.cpp and others --- test/CommonSyntaxTest.cpp | 24 ++++++++++++------------ test/libsolidity/util/TestFileParser.cpp | 8 ++++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp index 385ada76d..5b66aea30 100644 --- a/test/CommonSyntaxTest.cpp +++ b/test/CommonSyntaxTest.cpp @@ -83,9 +83,9 @@ TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const& void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted) { string nextIndentLevel = _linePrefix + " "; - AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl; + util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl; printErrorList(_stream, m_expectations, nextIndentLevel, _formatted); - AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl; + util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl; printErrorList(_stream, m_errorList, nextIndentLevel, _formatted); } @@ -104,8 +104,8 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, continue; if (outputSourceNames) - _stream << _linePrefix << formatting::CYAN << "==== Source: " << name << " ====" << formatting::RESET << endl; - vector sourceFormatting(source.length(), formatting::RESET); + _stream << _linePrefix << util::formatting::CYAN << "==== Source: " << name << " ====" << util::formatting::RESET << endl; + vector sourceFormatting(source.length(), util::formatting::RESET); for (auto const& error: m_errorList) if (error.sourceName == name && error.locationStart >= 0 && error.locationEnd >= 0) { @@ -115,11 +115,11 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, for (int i = error.locationStart; i < error.locationEnd; i++) if (isWarning) { - if (sourceFormatting[static_cast(i)] == formatting::RESET) - sourceFormatting[static_cast(i)] = formatting::ORANGE_BACKGROUND_256; + if (sourceFormatting[static_cast(i)] == util::formatting::RESET) + sourceFormatting[static_cast(i)] = util::formatting::ORANGE_BACKGROUND_256; } else - sourceFormatting[static_cast(i)] = formatting::RED_BACKGROUND; + sourceFormatting[static_cast(i)] = util::formatting::RED_BACKGROUND; } _stream << _linePrefix << sourceFormatting.front() << source.front(); @@ -131,12 +131,12 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, _stream << source[i]; else { - _stream << formatting::RESET << endl; + _stream << util::formatting::RESET << endl; if (i + 1 < source.length()) _stream << _linePrefix << sourceFormatting[i]; } } - _stream << formatting::RESET; + _stream << util::formatting::RESET; } else { @@ -157,12 +157,12 @@ void CommonSyntaxTest::printErrorList( ) { if (_errorList.empty()) - AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl; + util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl; else for (auto const& error: _errorList) { { - AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == "Warning") ? YELLOW : RED}); + util::AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == "Warning") ? YELLOW : RED}); _stream << _linePrefix << error.type; if (error.errorId.has_value()) _stream << ' ' << error.errorId->error; @@ -184,7 +184,7 @@ void CommonSyntaxTest::printErrorList( } } -string CommonSyntaxTest::errorMessage(Exception const& _e) +string CommonSyntaxTest::errorMessage(util::Exception const& _e) { if (_e.comment() && !_e.comment()->empty()) return boost::replace_all_copy(*_e.comment(), "\n", "\\n"); diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp index 007106294..11cfdbb86 100644 --- a/test/libsolidity/util/TestFileParser.cpp +++ b/test/libsolidity/util/TestFileParser.cpp @@ -16,6 +16,9 @@ */ // SPDX-License-Identifier: GPL-3.0 + +#include + #include #include @@ -34,6 +37,7 @@ #include using namespace solidity; +using namespace solidity::util; using namespace solidity::frontend; using namespace solidity::frontend::test; using namespace std; @@ -767,7 +771,7 @@ char TestFileParser::Scanner::scanHexPart() advance(); // skip 'x' int value{}; - if (util::isDigit(current())) + if (isDigit(current())) value = current() - '0'; else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') value = toLower(current()) - 'a' + 10; @@ -779,7 +783,7 @@ char TestFileParser::Scanner::scanHexPart() return static_cast(value); value <<= 4; - if (util::isDigit(current())) + if (isDigit(current())) value |= current() - '0'; else if (toLower(current()) >= 'a' && toLower(current()) <= 'f') value |= toLower(current()) - 'a' + 10; From 624d2d396881749c69c50c75f11469693c4655fe Mon Sep 17 00:00:00 2001 From: nishant-sachdeva Date: Fri, 11 Mar 2022 14:13:42 +0530 Subject: [PATCH 25/58] Error messages from abi encodecall are giving more details about the types of the involved variables --- libsolidity/analysis/TypeChecker.cpp | 4 ++-- ...bi_encode_convert_address_to_address_payable.sol | 11 +++++++++++ ...nction_pointer_to_different_function_pointer.sol | 13 +++++++++++++ ...ncode_convert_function_to_different_function.sol | 13 +++++++++++++ ...bi_encode_convert_string_to_different_string.sol | 12 ++++++++++++ .../specialFunctions/encodeCall_fail_args.sol | 2 +- 6 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 955c66f84..0ea9c6c08 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -2204,9 +2204,9 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa "Cannot implicitly convert component at position " + to_string(i) + " from \"" + - argType.canonicalName() + + argType.toString() + "\" to \"" + - functionPointerType->parameterTypes()[i]->canonicalName() + + functionPointerType->parameterTypes()[i]->toString() + "\"" + (result.message().empty() ? "." : ": " + result.message()) ); diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol new file mode 100644 index 000000000..a4c823a85 --- /dev/null +++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol @@ -0,0 +1,11 @@ +interface I { + function f(address payable) external; +} + +contract C { + function main() external view { + abi.encodeCall(I.f, (address(0))); + } +} +// ---- +// TypeError 5407: (136-148): Cannot implicitly convert component at position 0 from "address" to "address payable". diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol new file mode 100644 index 000000000..7c570e29e --- /dev/null +++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol @@ -0,0 +1,13 @@ +interface I { + function f(function (string calldata) external) external; +} + +contract C { + function g(string calldata) external {} + + function main() external view { + abi.encodeCall(I.f, (this.g)); + } +} +// ---- +// TypeError 5407: (201-209): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external". diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol new file mode 100644 index 000000000..7a35bfa55 --- /dev/null +++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol @@ -0,0 +1,13 @@ +interface I { + function f(function (string calldata) external view returns (uint)) external; +} + +contract C { + function g(string memory) external {} + + function main() external view { + abi.encodeCall(I.f, (this.g)); + } +} +// ---- +// TypeError 5407: (219-227): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) view external returns (uint256)". diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol new file mode 100644 index 000000000..72efe4a07 --- /dev/null +++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol @@ -0,0 +1,12 @@ +interface I { + function f(string calldata) external; +} + +contract C { + string s; + function main() external view { + abi.encodeCall(I.f, (s)); + } +} +// ---- +// TypeError 5407: (150-153): Cannot implicitly convert component at position 0 from "string storage ref" to "string calldata". diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol index a1c20f9bd..48372263f 100644 --- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol +++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol @@ -24,4 +24,4 @@ contract C { // TypeError 7788: (382-408): Expected 1 instead of 0 components for the tuple parameter. // TypeError 6219: (489-511): Expected two arguments: a function pointer followed by a tuple. // TypeError 7515: (597-628): Expected a tuple with 2 components instead of a single non-tuple parameter. -// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2]" to "int256". +// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2] memory" to "int256". From 9dc26af82902c4002a92ba23831b82ba15d823d0 Mon Sep 17 00:00:00 2001 From: wechman Date: Fri, 25 Feb 2022 11:12:18 +0100 Subject: [PATCH 26/58] Use "C" instead user environment locale in solc --- Changelog.md | 2 +- solc/main.cpp | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8b9fa530c..99aa6ebb8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -11,7 +11,7 @@ Compiler Features: Bugfixes: * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``. - + * Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored. ### 0.8.12 (2022-02-16) diff --git a/solc/main.cpp b/solc/main.cpp index ce69d20a7..50a6a8fc5 100644 --- a/solc/main.cpp +++ b/solc/main.cpp @@ -27,40 +27,16 @@ #include -#include #include using namespace std; using namespace solidity; -/* -The equivalent of setlocale(LC_ALL, "C") is called before any user code is run. -If the user has an invalid environment setting then it is possible for the call -to set locale to fail, so there are only two possible actions, the first is to -throw a runtime exception and cause the program to quit (default behaviour), -or the second is to modify the environment to something sensible (least -surprising behaviour). - -The follow code produces the least surprising behaviour. It will use the user -specified default locale if it is valid, and if not then it will modify the -environment the process is running in to use a sensible default. This also means -that users do not need to install language packs for their OS. -*/ -static void setDefaultOrCLocale() -{ -#if __unix__ - if (!std::setlocale(LC_ALL, "")) - { - setenv("LC_ALL", "C", 1); - } -#endif -} int main(int argc, char** argv) { try { - setDefaultOrCLocale(); solidity::frontend::CommandLineInterface cli(cin, cout, cerr); return cli.run(argc, argv) ? 0 : 1; } From 2d834eaf67ad05d4c5d21272cbea3bb51e1b44a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Fri, 25 Feb 2022 19:21:58 +0100 Subject: [PATCH 27/58] A script and CI job for testing the compiler with different locales --- .circleci/config.yml | 15 ++++++++ Changelog.md | 1 + test/localeTest.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100755 test/localeTest.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 65adf9ee3..bcfc99cd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1051,6 +1051,20 @@ jobs: t_ubu_release_cli: &t_ubu_release_cli <<: *t_ubu_cli + t_ubu_locale: + <<: *base_ubuntu2004_small + steps: + - checkout + - attach_workspace: + at: build + - run: + name: Install all locales + command: | + apt update --assume-yes + apt install locales-all --assume-yes --no-install-recommends + - run: test/localeTest.sh build/solc/solc + - gitter_notify_failure_unless_pr + t_ubu_asan_cli: # Runs slightly faster on medium but we only run it nightly so efficiency matters more. <<: *base_ubuntu2004_small @@ -1435,6 +1449,7 @@ workflows: # Ubuntu build and tests - b_ubu: *workflow_trigger_on_tags - t_ubu_cli: *workflow_ubuntu2004 + - t_ubu_locale: *workflow_ubuntu2004 - t_ubu_soltest_all: *workflow_ubuntu2004 - t_ubu_soltest_enforce_yul: *workflow_ubuntu2004 - b_ubu_clang: *workflow_trigger_on_tags diff --git a/Changelog.md b/Changelog.md index 99aa6ebb8..39d22c88e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ Bugfixes: * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``. * Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored. + ### 0.8.12 (2022-02-16) Language Features: diff --git a/test/localeTest.sh b/test/localeTest.sh new file mode 100755 index 000000000..58e2aad4d --- /dev/null +++ b/test/localeTest.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +#------------------------------------------------------------------------------ +# Script that tests that the compiler works correctly regardless of the locale +# setting. As a prerequisite, the following locales must be enabled system-wide: +# C, tr_TR.utf8, ja_JP.eucjp. +# +# Usage: +#