cerc-io/solidity
15
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 pull request #14133 from ethereum/codeTransformPush0

Browse Source 
Emit PUSH0 as junk in evm code transform, if available.
This commit is contained in:
Daniel 2023-04-17 17:24:54 +02:00 committed by GitHub
commit 9befe1d456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -10,6 +10,7 @@ Compiler Features:
* Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
* SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
* SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
* Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
Bugfixes:

3
libyul/backends/evm/AbstractAssembly.h
View File

@ -117,6 +117,9 @@ public:
/// Mark this assembly as invalid. Any attempt to request bytecode from it should throw.
virtual void markAsInvalid() = 0;
/// @returns the EVM version the assembly targets.
virtual langutil::EVMVersion evmVersion() const = 0;
};
enum class IdentifierContext { LValue, RValue, VariableDeclaration, NonExternal };

5
libyul/backends/evm/EthAssemblyAdapter.cpp
View File

@ -181,6 +181,11 @@ void EthAssemblyAdapter::markAsInvalid()
m_assembly.markAsInvalid();
}
langutil::EVMVersion EthAssemblyAdapter::evmVersion() const
{
return m_assembly.evmVersion();
}
EthAssemblyAdapter::LabelID EthAssemblyAdapter::assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag)
{
u256 id = _tag.data();

3
libyul/backends/evm/EthAssemblyAdapter.h
View File

@ -67,6 +67,9 @@ public:
void markAsInvalid() override;
langutil::EVMVersion evmVersion() const override;
private:
static LabelID assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag);
void appendJumpInstruction(evmasm::Instruction _instruction, JumpType _jumpType);

2
libyul/backends/evm/NoOutputAssembly.h
View File

@ -77,6 +77,8 @@ public:
void markAsInvalid() override {}
langutil::EVMVersion evmVersion() const override { return m_evmVersion; }
private:
int m_stackHeight = 0;
langutil::EVMVersion m_evmVersion;

5
libyul/backends/evm/OptimizedEVMCodeTransform.cpp
View File

@ -351,7 +351,10 @@ void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData cons
[&](JunkSlot const&)
{
// Note: this will always be popped, so we can push anything.
m_assembly.appendInstruction(evmasm::Instruction::CODESIZE);
if (m_assembly.evmVersion().hasPush0())
m_assembly.appendConstant(0);
else
m_assembly.appendInstruction(evmasm::Instruction::CODESIZE);
}
}, _slot);
},