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

Merge branch 'develop' of github.com:tfire/solidity into fix/remove-namespace-ast-annotations

Browse Source
This commit is contained in:
Tyler 2022-03-10 17:39:29 -05:00
commit 1c58b91075
190 changed files with 1684 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.circleci/config.yml
View File

@ -504,28 +504,14 @@ 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_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
@ -1466,12 +1452,8 @@ workflows:
- t_ems_ext_hardhat: *workflow_emscripten
- 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
@ -1488,8 +1470,7 @@ workflows:
<<: *workflow_trigger_on_tags
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

2
Changelog.md
View File

@ -6,6 +6,8 @@ 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(...)``.

2
docs/contracts/interfaces.rst
View File

@ -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.

61
libevmasm/PeepholeOptimiser.cpp
View File

@ -233,6 +233,65 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
}
};
struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
{
static size_t applySimple(
AssemblyItem const& _eq,
AssemblyItem const& _iszero,
AssemblyItem const& _pushTag,
AssemblyItem const& _jumpi,
std::back_insert_iterator<AssemblyItems> _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<DoubleJump>
{
static size_t applySimple(
AssemblyItem const& _pushTag1,
AssemblyItem const& _jumpi,
AssemblyItem const& _pushTag2,
AssemblyItem const& _jump,
AssemblyItem const& _tag1,
std::back_insert_iterator<AssemblyItems> _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<JumpToNext>
{
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() || (

4
libevmasm/SemanticInformation.cpp
View File

@ -121,7 +121,9 @@ vector<SemanticInformation::Operation> 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;

15
libsolidity/ast/Types.cpp
View File

@ -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());

11
libsolidity/ast/Types.h
View File

@ -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;

2
libsolidity/interface/OptimiserSettings.h
View File

@ -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

2
libyul/CMakeLists.txt
View File

@ -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

48
libyul/optimiser/StructuralSimplifier.cpp
View File

@ -55,6 +55,30 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const
return optional<vector<Statement>>{vector<Statement>{}};
}
optional<u256> hasLiteralValue(Expression const& _expression)
{
if (holds_alternative<Literal>(_expression))
return valueOfLiteral(std::get<Literal>(_expression));
else
return std::optional<u256>();
}
bool expressionAlwaysTrue(Expression const& _expression)
{
if (std::optional<u256> value = hasLiteralValue(_expression))
return *value != 0;
else
return false;
}
bool expressionAlwaysFalse(Expression const& _expression)
{
if (std::optional<u256> value = hasLiteralValue(_expression))
return *value == 0;
else
return false;
}
}
void StructuralSimplifier::run(OptimiserStepContext&, Block& _ast)
@ -103,27 +127,3 @@ void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
}
);
}
bool StructuralSimplifier::expressionAlwaysTrue(Expression const& _expression)
{
if (std::optional<u256> value = hasLiteralValue(_expression))
return *value != 0;
else
return false;
}
bool StructuralSimplifier::expressionAlwaysFalse(Expression const& _expression)
{
if (std::optional<u256> value = hasLiteralValue(_expression))
return *value == 0;
else
return false;
}
std::optional<u256> StructuralSimplifier::hasLiteralValue(Expression const& _expression) const
{
if (holds_alternative<Literal>(_expression))
return valueOfLiteral(std::get<Literal>(_expression));
else
return std::optional<u256>();
}

4
libyul/optimiser/StructuralSimplifier.h
View File

@ -18,7 +18,6 @@
#pragma once
#include <libyul/optimiser/ASTWalker.h>
#include <libyul/optimiser/DataFlowAnalyzer.h>
#include <libyul/optimiser/OptimiserStep.h>
#include <libsolutil/Common.h>
@ -50,9 +49,6 @@ private:
StructuralSimplifier() = default;
void simplify(std::vector<Statement>& _statements);
bool expressionAlwaysTrue(Expression const& _expression);
bool expressionAlwaysFalse(Expression const& _expression);
std::optional<u256> hasLiteralValue(Expression const& _expression) const;
};
}

3
libyul/optimiser/Suite.cpp
View File

@ -57,6 +57,7 @@
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/SyntacticalEquality.h>
#include <libyul/optimiser/UnusedAssignEliminator.h>
#include <libyul/optimiser/UnusedStoreEliminator.h>
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/LoadResolver.h>
#include <libyul/optimiser/LoopInvariantCodeMotion.h>
@ -222,6 +223,7 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
LoadResolver,
LoopInvariantCodeMotion,
UnusedAssignEliminator,
UnusedStoreEliminator,
ReasoningBasedSimplifier,
Rematerialiser,
SSAReverser,
@ -264,6 +266,7 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
{LoopInvariantCodeMotion::name, 'M'},
{ReasoningBasedSimplifier::name, 'R'},
{UnusedAssignEliminator::name, 'r'},
{UnusedStoreEliminator::name, 'S'},
{Rematerialiser::name, 'm'},
{SSAReverser::name, 'V'},
{SSATransform::name, 'a'},

379
libyul/optimiser/UnusedStoreEliminator.cpp Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
// 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 <libyul/optimiser/UnusedStoreEliminator.h>
#include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/OptimizerUtilities.h>
#include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/SSAValueTracker.h>
#include <libyul/optimiser/DataFlowAnalyzer.h>
#include <libyul/optimiser/KnowledgeBase.h>
#include <libyul/ControlFlowSideEffectsCollector.h>
#include <libyul/AST.h>
#include <libsolutil/CommonData.h>
#include <libevmasm/Instruction.h>
#include <libevmasm/SemanticInformation.h>
#include <range/v3/algorithm/all_of.hpp>
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<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
_context.dialect,
CallGraphGenerator::callGraph(_ast)
);
SSAValueTracker ssaValues;
ssaValues(_ast);
map<YulString, AssignedValue> 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<ExpressionStatement>(&_statement);
if (!exprStatement)
return;
FunctionCall const* funCall = get_if<FunctionCall>(&exprStatement->expression);
yulAssert(funCall);
optional<Instruction> instruction = toEVMInstruction(m_dialect, funCall->functionName.name);
if (!instruction)
return;
if (!ranges::all_of(funCall->arguments, [](Expression const& _expr) -> bool {
return get_if<Identifier>(&_expr) || get_if<Literal>(&_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<Operation> operations = operationsFromFunctionCall(*funCall);
yulAssert(operations.size() == 1, "");
m_storeOperations[&_statement] = move(operations.front());
}
}
void UnusedStoreEliminator::finalizeFunctionDefinition(FunctionDefinition const&)
{
changeUndecidedTo(State::Used);
scheduleUnusedForDeletion();
}
vector<UnusedStoreEliminator::Operation> 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> instruction = toEVMInstruction(m_dialect, functionName);
if (!instruction)
{
vector<Operation> 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<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
optional<u256> start1 = knowledge.valueIfKnownConstant(*_op1.start);
optional<u256> 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<u256> length2 = knowledge.valueIfKnownConstant(*_op2.length);
optional<u256> start2 = knowledge.valueIfKnownConstant(*_op2.start);
optional<u256> 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<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
optional<u256> 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<u256> coveredLength = knowledge.valueIfKnownConstant(*_covered.length);
optional<u256> coveringLength = knowledge.valueIfKnownConstant(*_covering.length);
if (knowledge.knownToBeEqual(*_covered.start, *_covering.start))
if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
return true;
optional<u256> coveredStart = knowledge.valueIfKnownConstant(*_covered.start);
optional<u256> 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<UnusedStoreEliminator::Location> _onlyLocation)
{
for (auto& [statement, state]: m_stores[YulString{}])
if (
state == State::Undecided &&
(_onlyLocation == nullopt || *_onlyLocation == m_storeOperations.at(statement).location)
)
state = _newState;
}
optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
{
if (Identifier const* identifier = get_if<Identifier>(&_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);
}

119
libyul/optimiser/UnusedStoreEliminator.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
// 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 <libyul/ASTForward.h>
#include <libyul/optimiser/ASTWalker.h>
#include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/UnusedStoreBase.h>
#include <libevmasm/SemanticInformation.h>
#include <map>
#include <vector>
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<YulString, SideEffects> const& _functionSideEffects,
std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
std::map<YulString, AssignedValue> 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<YulString> start;
/// Length of affected area, unknown if not provided.
/// Unused for storage.
std::optional<YulString> 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<Operation> 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<Location> _onlyLocation = std::nullopt);
void scheduleUnusedForDeletion();
std::optional<YulString> identifierNameIfSSA(Expression const& _expression) const;
bool const m_ignoreMemory;
std::map<YulString, SideEffects> const& m_functionSideEffects;
std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
std::map<YulString, AssignedValue> const& m_ssaValues;
std::map<Statement const*, Operation> m_storeOperations;
};
}

1
test/cmdlineTests/constant_optimizer_yul/output
View File

@ -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)

12
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
View File

@ -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)

12
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
View File

@ -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)

12
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
View File

@ -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)

2
test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
View File

@ -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)
}
}

2
test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
View File

@ -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)
}
}

2
test/cmdlineTests/ir_compiler_subobjects/output
View File

@ -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)
}
}

16
test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
View File

@ -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)

3
test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
View File

@ -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)
}
}

3
test/cmdlineTests/keccak_optimization_deploy_code/output
View File

@ -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()

1
test/cmdlineTests/keccak_optimization_low_runs/output
View File

@ -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)

5
test/cmdlineTests/optimizer_user_yul/output
View File

@ -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 {... */

27
test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
View File

@ -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 {

12
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
View File

@ -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)

12
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
View File

@ -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)

12
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
View File

@ -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)

10
test/cmdlineTests/standard_debug_info_in_yul_location/output.json
View File

@ -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\"

11
test/cmdlineTests/viair_subobject_optimization/output
View File

@ -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

2
test/cmdlineTests/viair_subobjects/output
View File

@ -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)
}
}

1
test/externalTests.sh
View File

@ -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" "$@"

24
test/externalTests/common.sh
View File

@ -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"

2
test/externalTests/euler.sh
View File

@ -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

81
test/externalTests/gnosis-v2.sh
View File

@ -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 <http://www.gnu.org/licenses/>
#
# (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

38
test/externalTests/gnosis.sh
View File

@ -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
}

63
test/formal/redundant_store_unrelated.py Normal file
View File

@ -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)

4
test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
View File

@ -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

8
test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
View File

@ -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

8
test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
View File

@ -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

4
test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
View File

@ -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

4
test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/bytes_length_member.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
View File

@ -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

10
test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
View File

@ -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

8
test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
View File

@ -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

20
test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
View File

@ -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

8
test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
View File

@ -48,6 +48,6 @@ contract C {
// compileViaYul: also
// ----
// f() -> 0xff
// gas irOptimized: 121145
// gas legacy: 128035
// gas legacyOptimized: 123476
// gas irOptimized: 121125
// gas legacy: 128005
// gas legacyOptimized: 123446

2
test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
View File

@ -18,6 +18,6 @@ contract C {
// compileViaYul: also
// ----
// test() -> 7
// gas irOptimized: 124041
// gas irOptimized: 124037
// gas legacy: 205196
// gas legacyOptimized: 204987

4
test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
View File

@ -21,5 +21,5 @@ contract C {
// ----
// f() -> 3
// gas irOptimized: 129916
// gas legacy: 130307
// gas legacyOptimized: 129363
// gas legacy: 130181
// gas legacyOptimized: 129198

4
test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
View File

@ -19,5 +19,5 @@ contract c {
// ----
// test1() -> true
// gas irOptimized: 225894
// gas legacy: 255577
// gas legacyOptimized: 248611
// gas legacy: 254650
// gas legacyOptimized: 247384

2
test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
View File

@ -16,4 +16,4 @@ contract C {
// compileViaYul: also
// ----
// f() -> 0, 0, 0
// gas irOptimized: 91098
// gas irOptimized: 90992

4
test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/function_array_cross_calls.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
View File

@ -18,6 +18,6 @@ contract c {
// ----
// test() ->
// gas irOptimized: 142640
// gas legacy: 165363
// gas legacyOptimized: 159446
// gas legacy: 164430
// gas legacyOptimized: 157898
// storageEmpty -> 1

4
test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
View File

@ -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

2
test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
View File

@ -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

6
test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
View File

@ -16,5 +16,5 @@ contract C {
// ----
// f() ->
// gas irOptimized: 179590
// gas legacy: 180620
// gas legacyOptimized: 180403
// gas legacy: 180602
// gas legacyOptimized: 180385

6
test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
View File

@ -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

4
test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
View File

@ -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() ->

2
test/libsolidity/semanticTests/array/reusing_memory.sol
View File

@ -26,6 +26,6 @@ contract Main {
// compileViaYul: also
// ----
// f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
// gas irOptimized: 113613
// gas irOptimized: 113604
// gas legacy: 126596
// gas legacyOptimized: 113823

6
test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
View File

@ -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

2
test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
View File

@ -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

6
test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
View File

@ -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

4
test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
View File

@ -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"

2
test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
View File

@ -19,7 +19,7 @@ contract Main {
// compileViaYul: also
// ----
// constructor(): "abc", true
// gas irOptimized: 107175
// gas irOptimized: 106221
// gas legacy: 145838
// gas legacyOptimized: 104017
// getFlag() -> true

2
test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
View File

@ -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

2
test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
View File

@ -19,6 +19,6 @@ contract C {
// compileViaYul: also
// ----
// f(), 2000 ether -> true
// gas irOptimized: 123037
// gas irOptimized: 120036
// gas legacy: 123226
// gas legacyOptimized: 123092

2
test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
View File

@ -15,5 +15,5 @@ contract B is A {
// compileViaYul: true
// ----
// constructor() ->
// gas irOptimized: 122017
// gas irOptimized: 121153
// y() -> 42

Some files were not shown because too many files have changed in this diff Show More