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 #1728 from ethereum/externalfunctiontypes

Browse Source 
Convert reference types to pointers in member function conversion.
This commit is contained in:
chriseth 2017-03-02 12:08:17 +01:00 committed by GitHub
commit 5c411b472b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -13,6 +13,7 @@ Bugfixes:
* Type system: Fix a crash caused by continuing on fatal errors in the code. * Type system: Fix a crash caused by continuing on fatal errors in the code.
* Type system: Disallow arrays with negative length. * Type system: Disallow arrays with negative length.
* Type system: Fix a crash related to invalid binary operators. * Type system: Fix a crash related to invalid binary operators.
* Type system: Correctly convert function argument types to pointers for member functions.
* Inline assembly: Charge one stack slot for non-value types during analysis. * Inline assembly: Charge one stack slot for non-value types during analysis.
* Assembly output: Print source location before the operation it refers to instead of after. * Assembly output: Print source location before the operation it refers to instead of after.

2
libsolidity/ast/Types.cpp
View File

@ -2493,7 +2493,7 @@ FunctionTypePointer FunctionType::asMemberFunction(bool _inLibrary, bool _bound)
{ {
auto refType = dynamic_cast<ReferenceType const*>(t.get()); auto refType = dynamic_cast<ReferenceType const*>(t.get());
if (refType && refType->location() == DataLocation::CallData) if (refType && refType->location() == DataLocation::CallData)
parameterTypes.push_back(refType->copyForLocation(DataLocation::Memory, false)); parameterTypes.push_back(refType->copyForLocation(DataLocation::Memory, true));
else else
parameterTypes.push_back(t); parameterTypes.push_back(t);
} }

17
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4736,6 +4736,23 @@ BOOST_AUTO_TEST_CASE(delete_external_function_type_invalid)
CHECK_ERROR(text, TypeError, ""); CHECK_ERROR(text, TypeError, "");
} }
BOOST_AUTO_TEST_CASE(external_function_to_function_type_calldata_parameter)
{
// This is a test that checks that the type of the `bytes` parameter is
// correctly changed from its own type `bytes calldata` to `bytes memory`
// when converting to a function type.
char const* text = R"(
contract C {
function f(function(bytes memory x) external g) { }
function callback(bytes x) external {}
function g() {
f(this.callback);
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(external_function_type_to_address) BOOST_AUTO_TEST_CASE(external_function_type_to_address)
{ {
char const* text = R"( char const* text = R"(