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 #3924 from ethereum/optim-address-op

Browse Source 
Remove unnecessary masking of the result of known short instructions
This commit is contained in:
chriseth 2018-04-20 08:57:00 +02:00 committed by GitHub
commit 0f3284316d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 110 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -1,6 +1,7 @@
### 0.4.24 (unreleased)
Features:
* Optimizer: Remove unnecessary masking of the result of known short instructions (``ADDRESS``, ``CALLER``, ``ORIGIN`` and ``COINBASE``).
Bugfixes:

20
libevmasm/RuleList.h
View File

@ -174,6 +174,26 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleList(
});
}
for (auto const& op: std::vector<Instruction>{
Instruction::ADDRESS,
Instruction::CALLER,
Instruction::ORIGIN,
Instruction::COINBASE
})
{
u256 const mask = (u256(1) << 160) - 1;
rules.push_back({
{Instruction::AND, {{op, mask}}},
[=]() -> Pattern { return op; },
false
});
rules.push_back({
{Instruction::AND, {{mask, op}}},
[=]() -> Pattern { return op; },
false
});
}
// Double negation of opcodes with boolean result
for (auto const& op: std::vector<Instruction>{
Instruction::EQ,

69
test/libevmasm/Optimiser.cpp
View File

@ -1072,6 +1072,75 @@ BOOST_AUTO_TEST_CASE(cse_sub_zero)
});
}
BOOST_AUTO_TEST_CASE(cse_remove_unwanted_masking_of_address)
{
vector<Instruction> ops{
Instruction::ADDRESS,
Instruction::CALLER,
Instruction::ORIGIN,
Instruction::COINBASE
};
for (auto const& op: ops)
{
checkCSE({
u256("0xffffffffffffffffffffffffffffffffffffffff"),
op,
Instruction::AND
}, {
op
});
checkCSE({
op,
u256("0xffffffffffffffffffffffffffffffffffffffff"),
Instruction::AND
}, {
op
});
// do not remove mask for other masking
checkCSE({
u256(1234),
op,
Instruction::AND
}, {
op,
u256(1234),
Instruction::AND
});
checkCSE({
op,
u256(1234),
Instruction::AND
}, {
u256(1234),
op,
Instruction::AND
});
}
// leave other opcodes untouched
checkCSE({
u256("0xffffffffffffffffffffffffffffffffffffffff"),
Instruction::CALLVALUE,
Instruction::AND
}, {
Instruction::CALLVALUE,
u256("0xffffffffffffffffffffffffffffffffffffffff"),
Instruction::AND
});
checkCSE({
Instruction::CALLVALUE,
u256("0xffffffffffffffffffffffffffffffffffffffff"),
Instruction::AND
}, {
u256("0xffffffffffffffffffffffffffffffffffffffff"),
Instruction::CALLVALUE,
Instruction::AND
});
}
BOOST_AUTO_TEST_SUITE_END()

20
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -11881,6 +11881,26 @@ BOOST_AUTO_TEST_CASE(bitwise_shifting_constants_constantinople)
BOOST_CHECK(callContractFunction("shr_3()") == encodeArgs(u256(1)));
}
BOOST_AUTO_TEST_CASE(senders_balance)
{
char const* sourceCode = R"(
contract C {
function f() public view returns (uint) {
return msg.sender.balance;
}
}
contract D {
C c = new C();
constructor() payable { }
function f() public view returns (uint) {
return c.f();
}
}
)";
compileAndRun(sourceCode, 27, "D");
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(27)));
}
BOOST_AUTO_TEST_SUITE_END()
}