cerc-io/solidity
15
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 #8586 from ethereum/immutableExternalFunctionPointers

Browse Source 
Disallow external function pointers as immutables.
This commit is contained in:
Daniel Kirchner 2020-04-06 10:53:54 +02:00 committed by GitHub
commit 8451639f17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/analysis/TypeChecker.cpp
View File

@ -481,8 +481,16 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
);
}
else if (_variable.immutable())
{
if (!_variable.type()->isValueType())
m_errorReporter.typeError(_variable.location(), "Immutable variables cannot have a non-value type.");
if (
auto const* functionType = dynamic_cast<FunctionType const*>(_variable.type());
functionType && functionType->kind() == FunctionType::Kind::External
)
m_errorReporter.typeError(_variable.location(), "Immutable variables of external function type are not yet supported.");
solAssert(_variable.type()->sizeOnStack() == 1 || m_errorReporter.hasErrors(), "");
}
if (!_variable.isStateVariable())
{

12
test/libsolidity/semanticTests/immutable/complexGetter.sol
View File

@ -1,12 +0,0 @@
contract C {
function() external returns (uint, uint) immutable public x = this.f;
function f() external pure returns (uint, uint) {
return (1, 2);
}
function test() external returns (uint, uint) {
return this.x()();
}
}
// ----
// test() -> 1, 2

20
test/libsolidity/semanticTests/immutable/external_function_pointer.sol
View File

@ -1,20 +0,0 @@
contract D {
function f() external view returns (uint256) {
return 42;
}
}
contract C {
D d;
function() external view returns(uint256) immutable z;
constructor() public {
d = new D();
z = d.f;
}
function f() public view returns (uint256) {
assert(z.address == address(d));
assert(z.selector == D.f.selector);
return z();
}
}
// ----
// f() -> 42

5
test/libsolidity/syntaxTests/immutable/external_function_pointer.sol Normal file
View File

@ -0,0 +1,5 @@
contract C {
function() external immutable f;
}
// ----
// TypeError: (17-48): Immutable variables of external function type are not yet supported.