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

Merge at least one implemented function in a 2-way merge with an implementation

Browse Source
This commit is contained in:
Bhargava Shastry 2020-04-16 11:25:33 +02:00
parent eb3672b522
commit b38ed7781d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/tools/ossfuzz/SolProtoAdaptor.cpp
View File

@ -981,17 +981,14 @@ void SolContract::merge()
"Sol proto fuzzer: n-way merge of non-virtual contract function is not possible"
);
// Assert contract functions are both implemented or unimplemented
assertThrow(
g->implemented() == function->implemented(),
langutil::FuzzerError,
"Sol proto fuzzer: n-way merge of an implemented contract function with an unimplemented contract function is not possible"
);
bool atleastOneImplements = (g->implemented() && !function->implemented()) ||
(!g->implemented() && function->implemented());
function->merge(*g);
// If abstract contract, we may implement
bool implement = abstract() ? coinToss() : true;
// If merged function has already been implemented
// we must implement.
if (function->implemented() && !implement)
// If merged function has already been implemented by at
// least one of the bases, we must implement.
if (atleastOneImplements && !implement)
implement = true;
// Create new contract function