diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-18 22:46:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 22:46:15 +0800 |
| commit | c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519 (patch) | |
| tree | 2530a0d9fac8acdc9833504db94b9b1aa570d39a /libevmasm/ConstantOptimiser.cpp | |
| parent | 48a3fe204f0e0865fb8f85349f196299c40b79ca (diff) | |
| parent | 0b68d093b45b71bf976f8cf37a6b917aa29ac4e3 (diff) | |
| download | dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar.gz dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar.bz2 dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar.lz dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar.xz dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.tar.zst dexon-solidity-c42dfc5b1083a0d49c64a6e3cbe2d3f220d1f519.zip | |
Merge pull request #4967 from ethereum/const-opt-cost
Move dataGas calculation helper to GasMeter
Diffstat (limited to 'libevmasm/ConstantOptimiser.cpp')
| -rw-r--r-- | libevmasm/ConstantOptimiser.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp index 07ece12c..9844ba3a 100644 --- a/libevmasm/ConstantOptimiser.cpp +++ b/libevmasm/ConstantOptimiser.cpp @@ -94,15 +94,7 @@ bigint ConstantOptimisationMethod::simpleRunGas(AssemblyItems const& _items) bigint ConstantOptimisationMethod::dataGas(bytes const& _data) const { assertThrow(_data.size() > 0, OptimizerException, "Empty bytecode generated."); - if (m_params.isCreation) - { - bigint gas; - for (auto b: _data) - gas += b ? GasCosts::txDataNonZeroGas : GasCosts::txDataZeroGas; - return gas; - } - else - return GasCosts::createDataGas * _data.size(); + return bigint(GasMeter::dataGas(_data, m_params.isCreation)); } size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items) |