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 (take 2)

Browse Source
This commit is contained in:
Bhargava Shastry 2020-04-16 12:15:03 +02:00
parent b38ed7781d
commit 7ac8731f47
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -980,9 +980,8 @@ void SolContract::merge()
langutil::FuzzerError,
"Sol proto fuzzer: n-way merge of non-virtual contract function is not possible"
);
// Assert contract functions are both implemented or unimplemented
bool atleastOneImplements = (g->implemented() && !function->implemented()) ||
(!g->implemented() && function->implemented());
// Check if at least one base implements function
bool atleastOneImplements = g->implemented() || function->implemented();
function->merge(*g);
// If abstract contract, we may implement
bool implement = abstract() ? coinToss() : true;