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

Force call of every valid func declaration

Browse Source
This commit is contained in:
Bhargava Shastry 2019-09-03 14:28:01 +02:00
parent 4837ef4ada
commit d066ba71a4
2 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
test/tools/ossfuzz/protoToYul.cpp
View File

@ -1078,6 +1078,44 @@ void ProtoConverter::registerFunction(FunctionDef const* _x)
m_functionDefMap.emplace(make_pair(_x, funcName));
}
void ProtoConverter::createFunctionCall(
string _funcName,
unsigned _numInParams,
unsigned _numOutParams
)
{
// Prints the following to output stream "let x_i,...,x_n := "
unsigned startIdx = counter();
vector<string> varsVec{};
if (_numOutParams > 0)
{
varsVec = createVarDecls(
startIdx,
startIdx + _numOutParams,
/*isAssignment=*/true
);
}
// Call the function with the correct number of input parameters via calls to calldataload with
// incremental addresses.
m_output << _funcName << "(";
for (unsigned i = 0; i < _numInParams; i++)
{
m_output << "calldataload(" << std::to_string(i*32) << ")";
if (i < _numInParams - 1)
m_output << ",";
}
m_output << ")\n";
// Save output values to storage
for (unsigned i = 0; i < varsVec.size(); i++)
m_output << "sstore(" << std::to_string(i*32) << ", " << varsVec[i] << ")\n";
// Add newly minted vars to current scope
if (!varsVec.empty())
addVarsToScope(varsVec);
}
void ProtoConverter::createFunctionDefAndCall(
FunctionDef const& _x,
unsigned _numInParams,
@ -1133,24 +1171,11 @@ void ProtoConverter::createFunctionDefAndCall(
m_inForBodyScope = wasInForBody;
m_inFunctionDef = wasInFunctionDef;
// Manually create a multi assignment using global variables
// This prints a_0, ..., a_k-1 for this function that returns "k" values
// if (_numOutParams > 0)
// m_output << dev::suffixedVariableNameList("a_", 0, _numOutParams) << " := ";
//
// // Call the function with the correct number of input parameters via calls to calldataload with
// // incremental addresses.
// m_output << funcName << "(";
// for (unsigned i = 0; i < _numInParams; i++)
// {
// m_output << "calldataload(" << std::to_string(i*32) << ")";
// if (i < _numInParams - 1)
// m_output << ",";
// }
// m_output << ")\n";
//
// for (unsigned i = 0; i < _numOutParams; i++)
// m_output << "sstore(" << std::to_string(i*32) << ", a_" << std::to_string(i) << ")\n";
yulAssert(
!m_inForInitScope,
"Proto fuzzer: Trying to create function call inside for-init block"
);
createFunctionCall(funcName, _numInParams, _numOutParams);
}
void ProtoConverter::visit(FunctionDef const& _x)

7
test/tools/ossfuzz/protoToYul.h
View File

@ -201,6 +201,13 @@ private:
/// @return A vector of strings containing the printed variable names.
std::vector<std::string> createVars(unsigned _startIdx, unsigned _endIdx);
/// Print the yul syntax to make a call to a function named @a _funcName to
/// the output stream.
/// @param _funcName Name of the function to be called
/// @param _numInParams Number of input parameters in function signature
/// @param _numOutParams Number of output parameters in function signature
void createFunctionCall(std::string _funcName, unsigned _numInParams, unsigned _numOutParams);
/// Register a function declaration
/// @param _f Pointer to a FunctionDef object
void registerFunction(FunctionDef const* _f);