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

Fix removal of memory stores in inline assembly blocks.

Browse Source
This commit is contained in:
chriseth 2022-06-07 12:30:13 +02:00 committed by Daniel Kirchner
parent 14cdb76e4b
commit 51ef6a62da
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@ -1,5 +1,9 @@
### 0.8.15 (unreleased) ### 0.8.15 (unreleased)
Important Bugfixes:
* Yul Optimizer: Keep all memory side-effects of inline assembly blocks.
Language Features: Language Features:
* Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic. * Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
* Errors and Events allow qualified access from other contracts. * Errors and Events allow qualified access from other contracts.

1
libsolidity/codegen/CompilerContext.cpp
View File

@ -485,6 +485,7 @@ void CompilerContext::appendInlineAssembly(
obj.code = parserResult; obj.code = parserResult;
obj.analysisInfo = make_shared<yul::AsmAnalysisInfo>(analysisInfo); obj.analysisInfo = make_shared<yul::AsmAnalysisInfo>(analysisInfo);
solAssert(!dialect.providesObjectAccess());
optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers); optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers);
if (_system) if (_system)

8
libyul/optimiser/UnusedStoreEliminator.cpp
View File

@ -31,6 +31,8 @@
#include <libyul/ControlFlowSideEffectsCollector.h> #include <libyul/ControlFlowSideEffectsCollector.h>
#include <libyul/AST.h> #include <libyul/AST.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <libsolutil/CommonData.h> #include <libsolutil/CommonData.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
@ -76,7 +78,13 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
ignoreMemory ignoreMemory
}; };
rse(_ast); rse(_ast);
if (
auto evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
evmDialect && evmDialect->providesObjectAccess()
)
rse.changeUndecidedTo(State::Unused, Location::Memory); rse.changeUndecidedTo(State::Unused, Location::Memory);
else
rse.changeUndecidedTo(State::Used, Location::Memory);
rse.changeUndecidedTo(State::Used, Location::Storage); rse.changeUndecidedTo(State::Used, Location::Storage);
rse.scheduleUnusedForDeletion(); rse.scheduleUnusedForDeletion();

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

@ -17,5 +17,5 @@ contract c {
// test() -> // test() ->
// gas irOptimized: 142639 // gas irOptimized: 142639
// gas legacy: 164430 // gas legacy: 164430
// gas legacyOptimized: 157898 // gas legacyOptimized: 158513
// storageEmpty -> 1 // storageEmpty -> 1