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

Refactor FuzzerSolverInterface.

Browse Source 
Co-authored-by: chriseth <chris@ethereum.org>
This commit is contained in:
Bhargava Shastry 2022-02-08 12:18:47 +01:00
parent 30550429eb
commit aeaf9addc0
2 changed files with 9 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
test/tools/ossfuzz/lpsolver/FuzzerSolverInterface.cpp
View File

@ -15,6 +15,8 @@
#include <test/tools/ossfuzz/lpsolver/FuzzerSolverInterface.h> #include <test/tools/ossfuzz/lpsolver/FuzzerSolverInterface.h>
#include <range/v3/view/enumerate.hpp>
using namespace solidity::test::fuzzer::lpsolver; using namespace solidity::test::fuzzer::lpsolver;
using namespace solidity::util; using namespace solidity::util;
using namespace std; using namespace std;
@ -25,69 +27,22 @@ FuzzerSolverInterface::FuzzerSolverInterface(bool _supportModels):
m_solvingState.variableNames.emplace_back(""); m_solvingState.variableNames.emplace_back("");
} }
LinearExpression FuzzerSolverInterface::constant(rational _value)
{
return LinearExpression::factorForVariable(0, _value);
}
LinearExpression FuzzerSolverInterface::variable(
rational _factor,
string const& _variable
)
{
return LinearExpression::factorForVariable(variableIndex(_variable), _factor);
}
void FuzzerSolverInterface::addLEConstraint(LinearExpression _lhs)
{
// Move constant to RHS
if (_lhs[0])
_lhs[0] = -_lhs[0];
m_solvingState.constraints.push_back({move(_lhs), false});
}
void FuzzerSolverInterface::addEQConstraint(LinearExpression _lhs)
{
// Move constant to RHS
if (_lhs[0])
_lhs[0] = -_lhs[0];
m_solvingState.constraints.push_back({move(_lhs), true});
}
LinearExpression FuzzerSolverInterface::linearExpression(vector<int> _factors) LinearExpression FuzzerSolverInterface::linearExpression(vector<int> _factors)
{ {
bool first = true;
unsigned count = 0;
LinearExpression lexp; LinearExpression lexp;
for (auto f: _factors) lexp.resize(_factors.size());
{ for (auto&& [index, value]: _factors | ranges::views::enumerate)
if (first) // Move constant term to RHS.
{ if (index == 0)
first = false; lexp[index] = -rational{value};
lexp += constant(f);
}
else else
lexp += variable(f, "x" + to_string(count++)); lexp[index] = rational{value};
}
return lexp; return lexp;
} }
void FuzzerSolverInterface::addEQConstraint(vector<int> _factors)
{
addEQConstraint(linearExpression(_factors));
}
void FuzzerSolverInterface::addLEConstraint(vector<int> _factors)
{
addLEConstraint(linearExpression(_factors));
}
void FuzzerSolverInterface::addConstraint(pair<bool, vector<int>> _constraint) void FuzzerSolverInterface::addConstraint(pair<bool, vector<int>> _constraint)
{ {
if (_constraint.first) m_solvingState.constraints.push_back({linearExpression(move(_constraint.second)), _constraint.first});
addEQConstraint(_constraint.second);
else
addLEConstraint(_constraint.second);
} }
void FuzzerSolverInterface::addConstraints(vector<pair<bool, vector<int>>> _constraints) void FuzzerSolverInterface::addConstraints(vector<pair<bool, vector<int>>> _constraints)
@ -121,16 +76,3 @@ string FuzzerSolverInterface::lpResult(LPResult _result)
return "infeasible"; return "infeasible";
} }
} }
size_t FuzzerSolverInterface::variableIndex(string const& _name)
{
if (m_solvingState.variableNames.empty())
m_solvingState.variableNames.emplace_back("");
auto index = findOffset(m_solvingState.variableNames, _name);
if (!index)
{
index = m_solvingState.variableNames.size();
m_solvingState.variableNames.emplace_back(_name);
}
return *index;
}

30
test/tools/ossfuzz/lpsolver/FuzzerSolverInterface.h
View File

@ -36,33 +36,6 @@ class FuzzerSolverInterface
public: public:
FuzzerSolverInterface(bool _supportModels); FuzzerSolverInterface(bool _supportModels);
/// @returns constant rational.
solidity::util::LinearExpression constant(solidity::util::rational _rationalConstant);
/// @returns linear expression that equals zero.
solidity::util::LinearExpression zero()
{
return constant(0);
}
/// @returns product of a rational factor and variable.
solidity::util::LinearExpression variable(
solidity::util::rational _factor,
std::string const& _variable
);
/// Adds less-than-equal-zero constraint to solver.
void addLEConstraint(solidity::util::LinearExpression _lhs);
/// Adds equal-to-zero constraint to solver.
void addEQConstraint(solidity::util::LinearExpression _lhs);
/// Adds less-than-equal constraint from vector of factors.
void addLEConstraint(std::vector<int> _factors);
/// Adds equal-to constraint from vector of factors.
void addEQConstraint(std::vector<int> _factors);
/// Adds @param _constraint to LP solver. /// Adds @param _constraint to LP solver.
void addConstraint(std::pair<bool, std::vector<int>> _constraint); void addConstraint(std::pair<bool, std::vector<int>> _constraint);
@ -79,9 +52,6 @@ public:
std::string checkResult(); std::string checkResult();
private: private:
/// Adds variable if necessary to LP solver state and @returns index of variable.
size_t variableIndex(std::string const& _name);
/// @returns LP result as string. /// @returns LP result as string.
std::string lpResult(solidity::util::LPResult _result); std::string lpResult(solidity::util::LPResult _result);