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 pull request #9559 from ethereum/fix-9558

Browse Source 
yul: Set non movable flag to true in simplification rule for byte of …
This commit is contained in:
chriseth 2020-08-04 11:20:24 +02:00 committed by GitHub
commit f079efe28c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Optimizer: Keep side-effects of ``x`` in ``byte(a, shr(b, x))`` even if the constants ``a`` and ``b`` would make the expression zero unconditionally. This optimizer rule is very hard if not impossible to trigger in a way that it can result in invalid code, though.
* SMTChecker: Fix internal error on fixed bytes index access. * SMTChecker: Fix internal error on fixed bytes index access.

15
libevmasm/RuleList.h
View File

@ -581,9 +581,20 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart7(
rules.push_back({ rules.push_back({
Builtins::BYTE(A, Builtins::SHR(B, X)), Builtins::BYTE(A, Builtins::SHR(B, X)),
[=]() -> Pattern { return A.d() < B.d() / 8 ? Word(0) : Builtins::BYTE(A.d() - B.d() / 8, X); }, [=]() -> Pattern { return Word(0); },
true,
[=] {
return B.d() % 8 == 0 && A.d() < Pattern::WordSize / 8 && B.d() <= Pattern::WordSize && A.d() < B.d() / 8;
}
});
rules.push_back({
Builtins::BYTE(A, Builtins::SHR(B, X)),
[=]() -> Pattern { return Builtins::BYTE(A.d() - B.d() / 8, X); },
false, false,
[=] { return B.d() % 8 == 0 && A.d() < Pattern::WordSize / 8 && B.d() <= Pattern::WordSize; } [=] {
return B.d() % 8 == 0 && A.d() < Pattern::WordSize / 8 && B.d() <= Pattern::WordSize && A.d() >= B.d() / 8;
}
}); });
return rules; return rules;

10
test/libyul/yulInterpreterTests/pop_byte_shr_call.yul Normal file
View File

@ -0,0 +1,10 @@
{
pop(byte(0, shr(0x8, call(0, 0, 0, 0, 0, 0, 0))))
}
// ====
// EVMVersion: >=constantinople
// ----
// Trace:
// CALL(0, 0, 0, 0, 0, 0, 0)
// Memory dump:
// Storage dump:

11
test/libyul/yulInterpreterTests/pop_byte_shr_func.yul Normal file
View File

@ -0,0 +1,11 @@
{
function f() -> x { mstore(0, 0x1337) }
pop(byte(0, shr(0x8, f())))
}
// ====
// EVMVersion: >=constantinople
// ----
// Trace:
// Memory dump:
// 0: 0000000000000000000000000000000000000000000000000000000000001337
// Storage dump:

11
test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul Normal file
View File

@ -0,0 +1,11 @@
{
pop(byte(0, shr(0x8, call(0, 0, 0, 0, 0, 0, 0))))
}
// ====
// EVMVersion: >=constantinople
// ----
// step: expressionSimplifier
//
// {
// pop(byte(0, shr(0x8, call(0, 0, 0, 0, 0, 0, 0))))
// }

14
test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul Normal file
View File

@ -0,0 +1,14 @@
{
function f() -> x { mstore(0, 1337) }
pop(byte(0, shr(0x8, f())))
}
// ====
// EVMVersion: >=constantinople
// ----
// step: expressionSimplifier
//
// {
// function f() -> x
// { mstore(0, 1337) }
// pop(byte(0, shr(0x8, f())))
// }

14
test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul Normal file
View File

@ -0,0 +1,14 @@
{
function f() -> x {}
pop(byte(0, shr(0x8, f())))
}
// ====
// EVMVersion: >=constantinople
// ----
// step: expressionSimplifier
//
// {
// function f() -> x
// { }
// pop(byte(0, shr(0x8, f())))
// }