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

Add PathGasMeter.estimateMax helper

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-09-18 16:16:21 +01:00
parent 9be058eb70
commit d64be90497
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libevmasm/PathGasMeter.h
View File

@ -57,6 +57,16 @@ public:
GasMeter::GasConsumption estimateMax(size_t _startIndex, std::shared_ptr<KnownState> const& _state); GasMeter::GasConsumption estimateMax(size_t _startIndex, std::shared_ptr<KnownState> const& _state);
static GasMeter::GasConsumption estimateMax(
AssemblyItems const& _items,
solidity::EVMVersion _evmVersion,
size_t _startIndex,
std::shared_ptr<KnownState> const& _state
)
{
return PathGasMeter(_items, _evmVersion).estimateMax(_startIndex, _state);
}
private: private:
/// Adds a new path item to the queue, but only if we do not already have /// Adds a new path item to the queue, but only if we do not already have
/// a higher gas usage at that point. /// a higher gas usage at that point.

5
libsolidity/interface/GasEstimator.cpp
View File

@ -160,8 +160,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
); );
} }
PathGasMeter meter(_items, m_evmVersion); return PathGasMeter::estimateMax(_items, m_evmVersion, 0, state);
return meter.estimateMax(0, state);
} }
GasEstimator::GasConsumption GasEstimator::functionalEstimation( GasEstimator::GasConsumption GasEstimator::functionalEstimation(
@ -183,7 +182,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
if (parametersSize > 0) if (parametersSize > 0)
state->feedItem(swapInstruction(parametersSize)); state->feedItem(swapInstruction(parametersSize));
return PathGasMeter(_items, m_evmVersion).estimateMax(_offset, state); return PathGasMeter::estimateMax(_items, m_evmVersion, _offset, state);
} }
set<ASTNode const*> GasEstimator::finestNodesAtLocation( set<ASTNode const*> GasEstimator::finestNodesAtLocation(