cerc-io/solidity
10
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

Use callable types for override check.

Browse Source
This commit is contained in:
chriseth 2018-11-22 14:57:37 +01:00
parent 9a4968ba1d
commit 939365a1d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/analysis/TypeChecker.cpp
View File

@ -402,10 +402,10 @@ void TypeChecker::checkContractIllegalOverrides(ContractDefinition const& _contr
void TypeChecker::checkFunctionOverride(FunctionDefinition const& _function, FunctionDefinition const& _super) void TypeChecker::checkFunctionOverride(FunctionDefinition const& _function, FunctionDefinition const& _super)
{ {
FunctionType functionType(_function); FunctionTypePointer functionType = FunctionType(_function).asCallableFunction(false);
FunctionType superType(_super); FunctionTypePointer superType = FunctionType(_super).asCallableFunction(false);
if (!functionType.hasEqualParameterTypes(superType)) if (!functionType->hasEqualParameterTypes(*superType))
return; return;
if (!_function.annotation().superFunction) if (!_function.annotation().superFunction)
@ -431,7 +431,7 @@ void TypeChecker::checkFunctionOverride(FunctionDefinition const& _function, Fun
stateMutabilityToString(_function.stateMutability()) + stateMutabilityToString(_function.stateMutability()) +
"\"." "\"."
); );
else if (functionType != superType) else if (*functionType != *superType)
overrideError(_function, _super, "Overriding function return types differ."); overrideError(_function, _super, "Overriding function return types differ.");
} }