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

.delegatecall() should always return a boolean of execution status

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-08-01 10:43:06 +01:00
parent 3aacfc7e35
commit b3061225bc
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -3,6 +3,7 @@
Features:
Bugfixes:
* Code Generator: ``.delegatecall()`` should always return execution outcome.
* Code Generator: Provide "new account gas" for low-level ``callcode`` and ``delegatecall``.
### 0.4.14 (2017-07-31)

2
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -1560,7 +1560,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
utils().moveToStackTop(gasValueSize, _functionType.selfType()->sizeOnStack());
auto funKind = _functionType.kind();
bool returnSuccessCondition = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareCallCode;
bool returnSuccessCondition = funKind == FunctionType::Kind::BareCall || funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::BareDelegateCall;
bool isCallCode = funKind == FunctionType::Kind::BareCallCode || funKind == FunctionType::Kind::CallCode;
bool isDelegateCall = funKind == FunctionType::Kind::BareDelegateCall || funKind == FunctionType::Kind::DelegateCall;

36
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -9897,6 +9897,42 @@ BOOST_AUTO_TEST_CASE(inlineasm_empty_let)
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(0), u256(0)));
}
BOOST_AUTO_TEST_CASE(delegatecall_return_value)
{
char const* sourceCode = R"DELIMITER(
contract C {
uint value;
function set(uint _value) external {
value = _value;
}
function get() external constant returns (uint) {
return value;
}
function get_delegated() external constant returns (bool) {
return this.delegatecall(bytes4(sha3("get()")));
}
function assert0() external constant {
assert(value == 0);
}
function assert0_delegated() external constant returns (bool) {
return this.delegatecall(bytes4(sha3("assert0()")));
}
}
)DELIMITER";
compileAndRun(sourceCode, 0, "C");
BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(0)));
BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("set(uint256)", u256(1)) == encodeArgs());
BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(0)));
BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
BOOST_CHECK(callContractFunction("set(uint256)", u256(42)) == encodeArgs());
BOOST_CHECK(callContractFunction("get()") == encodeArgs(u256(42)));
BOOST_CHECK(callContractFunction("assert0_delegated()") == encodeArgs(u256(0)));
BOOST_CHECK(callContractFunction("get_delegated()") == encodeArgs(u256(1)));
}
BOOST_AUTO_TEST_SUITE_END()
}