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 #8630 from ethereum/encoding-bug-functionCallOption

Browse Source 
TypeChecker error when encoding functions with call options; tests
This commit is contained in:
chriseth 2020-04-08 16:33:24 +02:00 committed by GitHub
commit 748afe0edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -12,6 +12,7 @@ Compiler Features:
Bugfixes:
* AST export: Export `immutable` property in the field `mutability`.
* SMTChecker: Fix internal error in the CHC engine when calling inherited functions internally.
* Type Checker: Error when trying to encode functions with call options gas and value.

2
libsolidity/ast/Types.cpp
View File

@ -3112,6 +3112,8 @@ MemberList::MemberMap FunctionType::nativeMembers(ContractDefinition const* _sco
TypePointer FunctionType::encodingType() const
{
if (m_gasSet || m_valueSet)
return nullptr;
// Only external functions can be encoded, internal functions cannot leave code boundaries.
if (m_kind == Kind::External)
return this;

11
test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol Normal file
View File

@ -0,0 +1,11 @@
contract C {
function f() public payable {
abi.encode(this.f{value: 2});
abi.encode(this.f{gas: 2});
abi.encode(this.f{value: 2, gas: 1});
}
}
// ----
// TypeError: (60-76): This type cannot be encoded.
// TypeError: (92-106): This type cannot be encoded.
// TypeError: (122-146): This type cannot be encoded.

7
test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
View File

@ -1,12 +1,11 @@
contract C {
function f() public pure {
bytes32 h = keccak256(abi.encodePacked(keccak256, f, this.f.gas, blockhash));
bytes32 h = keccak256(abi.encodePacked(keccak256, f, this.f{gas: 2}, blockhash));
h;
}
}
// ----
// Warning: (105-115): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
// TypeError: (91-100): This type cannot be encoded.
// TypeError: (102-103): This type cannot be encoded.
// TypeError: (105-115): This type cannot be encoded.
// TypeError: (117-126): This type cannot be encoded.
// TypeError: (105-119): This type cannot be encoded.
// TypeError: (121-130): This type cannot be encoded.