diff options
author | chriseth <chris@ethereum.org> | 2018-05-04 23:18:02 +0800 |
---|---|---|
committer | chriseth <chris@ethereum.org> | 2018-05-09 16:53:30 +0800 |
commit | fba7e055d9fb20b3053362f0099d2fbaacfb7432 (patch) | |
tree | 28773b8de71f2ece2f87fdccb9a01ba97f143f0d /libevmasm/PathGasMeter.h | |
parent | 10792dbc909bdd2c8ba7c0301ed81ee28b0ae1cc (diff) | |
download | dexon-solidity-fba7e055d9fb20b3053362f0099d2fbaacfb7432.tar.gz dexon-solidity-fba7e055d9fb20b3053362f0099d2fbaacfb7432.tar.zst dexon-solidity-fba7e055d9fb20b3053362f0099d2fbaacfb7432.zip |
Follow highest gas usage only for gas estimation.
Diffstat (limited to 'libevmasm/PathGasMeter.h')
-rw-r--r-- | libevmasm/PathGasMeter.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libevmasm/PathGasMeter.h b/libevmasm/PathGasMeter.h index 2527d7fb..9537b176 100644 --- a/libevmasm/PathGasMeter.h +++ b/libevmasm/PathGasMeter.h @@ -58,9 +58,17 @@ public: GasMeter::GasConsumption estimateMax(size_t _startIndex, std::shared_ptr<KnownState> const& _state); private: + /// Adds a new path item to the queue, but only if we do not already have + /// a higher gas usage at that point. + /// This is not exact as different state might influence higher gas costs at a later + /// point in time, but it greatly reduces computational overhead. + void queue(std::unique_ptr<GasPath>&& _newPath); GasMeter::GasConsumption handleQueueItem(); - std::vector<std::unique_ptr<GasPath>> m_queue; + /// Map of jumpdest -> gas path, so not really a queue. We only have one queued up + /// item per jumpdest, because of the behaviour of `queue` above. + std::map<size_t, std::unique_ptr<GasPath>> m_queue; + std::map<size_t, GasMeter::GasConsumption> m_highestGasUsagePerJumpdest; std::map<u256, size_t> m_tagPositions; AssemblyItems const& m_items; solidity::EVMVersion m_evmVersion; |