diff options
| author | chriseth <chris@ethereum.org> | 2018-08-14 23:53:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 23:53:48 +0800 |
| commit | cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03 (patch) | |
| tree | 6953422720b9e5d943c8307874d5626f7af4e203 /libevmasm/ConstantOptimiser.cpp | |
| parent | 3f42118d1987ce99b6088d7076b32413373dd09c (diff) | |
| parent | 0b6a26f8544f632b557681e26ebc2b395bf03b20 (diff) | |
| download | dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar.gz dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar.bz2 dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar.lz dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar.xz dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.tar.zst dexon-solidity-cc2dcf5c312bbc8cd7ad5e2b4dfbdb084f77fe03.zip | |
Merge pull request #4776 from ethereum/const-opt-cost
Calculate the dataGas correctly in the constant optimiser
Diffstat (limited to 'libevmasm/ConstantOptimiser.cpp')
| -rw-r--r-- | libevmasm/ConstantOptimiser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp index d0b6843c..07ece12c 100644 --- a/libevmasm/ConstantOptimiser.cpp +++ b/libevmasm/ConstantOptimiser.cpp @@ -93,6 +93,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; @@ -101,7 +102,7 @@ bigint ConstantOptimisationMethod::dataGas(bytes const& _data) const return gas; } else - return GasCosts::createDataGas * dataSize(); + return GasCosts::createDataGas * _data.size(); } size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items) |