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

Warn if override specifier list oder differst from inheritance order

Browse Source
This commit is contained in:
Mathias Baumann 2020-02-27 15:23:47 +01:00
parent 4ed9282b29
commit c42f4d8335
7 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -2,6 +2,7 @@
Language Features:
* Inline Assembly: Allow assigning to `_slot` of local storage variable pointers.
* Type Checker: Warn if override specifier list order differs from inheritance order.
Compiler Features:

32
libsolidity/analysis/OverrideChecker.cpp
View File

@ -767,6 +767,38 @@ void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySign
}
}
}
else if (specifiedContracts.size() > 1)
{
vector<int64_t> overrideSpecifierContractIds;
vector<int64_t> inheritanceContractsIds;
for (auto const& overrideName: _item.overrides()->overrides())
{
int64_t const contractId = overrideName->annotation().referencedDeclaration->id();
auto const matchId = [&](ContractDefinition const* _contract)
{
return contractId == _contract->id();
};
// Only compare contracts that exist in the inheritance chain
if (util::contains_if(_item.contract().annotation().linearizedBaseContracts, matchId))
overrideSpecifierContractIds.emplace_back(contractId);
}
for (size_t i = _item.contract().annotation().linearizedBaseContracts.size() - 1; i > 0; i--)
{
int64_t contractId = _item.contract().annotation().linearizedBaseContracts[i]->id();
if (util::contains(overrideSpecifierContractIds, contractId))
inheritanceContractsIds.emplace_back(contractId);
}
if (overrideSpecifierContractIds != inheritanceContractsIds)
m_errorReporter.warning(
_item.overrides()->location(),
"Override specifier list order differs from inheritance order."
);
}
set<ContractDefinition const*, CompareByID> expectedContracts;

1
test/libsolidity/syntaxTests/inheritance/override/override_interface_multiple.sol
View File

@ -12,3 +12,4 @@ contract X is A, B {
function test2() external override(B, A) returns (uint256) {}
}
// ----
// Warning: (325-339): Override specifier list order differs from inheritance order.

1
test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
View File

@ -18,5 +18,6 @@ abstract contract X is A, B, C, D {
function foo() internal override(A, C) virtual returns (uint256);
}
// ----
// Warning: (533-550): Override specifier list order differs from inheritance order.
// TypeError: (533-550): Invalid contract specified in override list: "C".
// TypeError: (603-617): Function needs to specify overridden contracts "B" and "D".

2
test/libsolidity/syntaxTests/inheritance/override/override_shared_base_partial.sol
View File

@ -8,3 +8,5 @@ contract B is I {}
contract C is A, B {
function f() external override(A, I) {}
}
// ----
// Warning: (178-192): Override specifier list order differs from inheritance order.

1
test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_fail.sol
View File

@ -12,4 +12,5 @@ abstract contract D is B, A {
}
// ----
// TypeError: (154-199): Overriding an implemented function with an unimplemented function is not allowed.
// Warning: (266-280): Override specifier list order differs from inheritance order.
// TypeError: (236-281): Overriding an implemented function with an unimplemented function is not allowed.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/055_inheritance_diamond_basic.sol
View File

@ -3,6 +3,6 @@ contract inter1 is root { function f() public virtual {} }
contract inter2 is root { function f() public virtual {} }
contract derived is root, inter2, inter1 {
function g() public { f(); rootFunction(); }
function f() override(inter1, inter2) public {}
function f() override(inter2, inter1) public {}
}
// ----