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

Bring back solving with temporary file for Eldarica

Browse Source
This commit is contained in:
Martin Blicha 2023-08-17 09:13:46 +02:00
parent 497ca183b4
commit d8c1a124e7
1 changed files with 71 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
libsolidity/interface/SMTSolverCommand.cpp
View File

@ -22,9 +22,12 @@
#include <libsolutil/CommonIO.h>
#include <libsolutil/Exceptions.h>
#include <libsolutil/Keccak256.h>
#include <libsolutil/TemporaryDirectory.h>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/process.hpp>
using solidity::langutil::InternalCompilerError;
@ -34,6 +37,71 @@ using solidity::util::errinfo_comment;
namespace solidity::frontend
{
namespace
{
ReadCallback::Result solveWithTemporaryFile(
boost::filesystem::path const& _pathToBinary,
std::vector<std::string> _commandArgs,
std::string const& _query
)
{
auto tempDir = solidity::util::TemporaryDirectory("smt");
util::h256 queryHash = util::keccak256(_query);
auto queryFileName = tempDir.path() / ("query_" + queryHash.hex() + ".smt2");
auto queryFile = boost::filesystem::ofstream(queryFileName);
queryFile << _query << std::flush;
_commandArgs.push_back(queryFileName.string());
boost::process::ipstream out; // output from subprocess read by main process
boost::process::child solver(
_pathToBinary,
boost::process::args(_commandArgs),
boost::process::std_out > out
);
std::vector<std::string> data;
std::string line;
while (std::getline(out, line))
if (!line.empty())
data.push_back(line);
solver.wait();
return ReadCallback::Result{true, boost::join(data, "\n")};
}
ReadCallback::Result solveWithPipe(
boost::filesystem::path const& _pathToBinary,
std::vector<std::string> _commandArgs,
std::string const& _query
)
{
boost::process::opstream in; // input to subprocess written to by main process
boost::process::ipstream out; // output from subprocess read by main process
boost::process::child solver(
_pathToBinary,
boost::process::args(_commandArgs),
boost::process::std_out > out,
boost::process::std_in < in
);
in << _query << std::flush;
in.pipe().close();
in.close();
std::vector<std::string> data;
std::string line;
while (std::getline(out, line))
if (!line.empty())
data.push_back(line);
solver.wait();
return ReadCallback::Result{true, boost::join(data, "\n")};
}
} // namespace
ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
{
try
@ -55,28 +123,9 @@ ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::stri
commandArgs.erase(commandArgs.begin());
boost::process::opstream in; // input to subprocess written to by main process
boost::process::ipstream out; // output from subprocess read by main process
boost::process::child solver(
pathToBinary,
boost::process::args(commandArgs),
boost::process::std_out > out,
boost::process::std_in < in
);
in << _query << std::flush;
in.pipe().close();
in.close();
std::vector<std::string> data;
std::string line;
while (std::getline(out, line))
if (!line.empty())
data.push_back(line);
solver.wait();
return ReadCallback::Result{true, boost::join(data, "\n")};
if (solverBinary == "eld")
return solveWithTemporaryFile(pathToBinary, std::move(commandArgs), _query);
return solveWithPipe(pathToBinary, std::move(commandArgs), _query);
}
catch (...)
{