mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Make Yul optimizer not fail for wasm.
This commit is contained in:
@@ -22,9 +22,6 @@
|
||||
|
||||
#include <libyul/optimiser/ASTWalker.h>
|
||||
#include <liblangutil/EVMVersion.h>
|
||||
#include <libevmasm/Instruction.h>
|
||||
|
||||
#include <libevmasm/Instruction.h>
|
||||
|
||||
namespace yul
|
||||
{
|
||||
@@ -96,75 +93,6 @@ private:
|
||||
size_t m_cost = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* Gas meter for expressions only involving literals, identifiers and
|
||||
* EVM instructions.
|
||||
*
|
||||
* Assumes that EXP is not used with exponents larger than a single byte.
|
||||
* Is not particularly exact for anything apart from arithmetic.
|
||||
*/
|
||||
class GasMeter
|
||||
{
|
||||
public:
|
||||
GasMeter(EVMDialect const& _dialect, bool _isCreation, size_t _runs):
|
||||
m_dialect(_dialect),
|
||||
m_isCreation{_isCreation},
|
||||
m_runs(_runs)
|
||||
{}
|
||||
|
||||
/// @returns the full combined costs of deploying and evaluating the expression.
|
||||
size_t costs(Expression const& _expression) const;
|
||||
/// @returns the combined costs of deploying and running the instruction, not including
|
||||
/// the costs for its arguments.
|
||||
size_t instructionCosts(dev::eth::Instruction _instruction) const;
|
||||
|
||||
private:
|
||||
size_t combineCosts(std::pair<size_t, size_t> _costs) const;
|
||||
|
||||
EVMDialect const& m_dialect;
|
||||
bool m_isCreation = false;
|
||||
size_t m_runs;
|
||||
};
|
||||
|
||||
class GasMeterVisitor: public ASTWalker
|
||||
{
|
||||
public:
|
||||
static std::pair<size_t, size_t> costs(
|
||||
Expression const& _expression,
|
||||
EVMDialect const& _dialect,
|
||||
bool _isCreation
|
||||
);
|
||||
|
||||
static std::pair<size_t, size_t> instructionCosts(
|
||||
dev::eth::Instruction _instruction,
|
||||
EVMDialect const& _dialect,
|
||||
bool _isCreation = false
|
||||
);
|
||||
|
||||
public:
|
||||
GasMeterVisitor(EVMDialect const& _dialect, bool _isCreation):
|
||||
m_dialect(_dialect),
|
||||
m_isCreation{_isCreation}
|
||||
{}
|
||||
|
||||
void operator()(FunctionCall const& _funCall) override;
|
||||
void operator()(FunctionalInstruction const& _instr) override;
|
||||
void operator()(Literal const& _literal) override;
|
||||
void operator()(Identifier const& _identifier) override;
|
||||
|
||||
private:
|
||||
size_t singleByteDataGas() const;
|
||||
/// Computes the cost of storing and executing the single instruction (excluding its arguments).
|
||||
/// For EXP, it assumes that the exponent is at most 255.
|
||||
/// Does not work particularly exact for anything apart from arithmetic.
|
||||
void instructionCostsInternal(dev::eth::Instruction _instruction);
|
||||
|
||||
EVMDialect const& m_dialect;
|
||||
bool m_isCreation = false;
|
||||
size_t m_runGas = 0;
|
||||
size_t m_dataGas = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* Counts the number of assignments to every variable.
|
||||
* Only works after running the Disambiguator.
|
||||
|
||||
Reference in New Issue
Block a user