diff options
| author | chriseth <chris@ethereum.org> | 2017-03-16 01:07:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 01:07:52 +0800 |
| commit | f0d539ae05739e35336cc9cc8f44bd9798a95c28 (patch) | |
| tree | 13ef1dea012c7f093122d5e7578dc3c893636e59 /libevmasm/ConstantOptimiser.cpp | |
| parent | 364da425d3116a4b85863df39a1864340861d71e (diff) | |
| parent | 59099908c53129b2f5723bd0d5283c4da089e398 (diff) | |
| download | dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.gz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.bz2 dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.lz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.xz dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.tar.zst dexon-solidity-f0d539ae05739e35336cc9cc8f44bd9798a95c28.zip | |
Merge pull request #1782 from ethereum/develop
Solidity 0.4.10
Diffstat (limited to 'libevmasm/ConstantOptimiser.cpp')
| -rw-r--r-- | libevmasm/ConstantOptimiser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp index 86244e17..a1dfd21c 100644 --- a/libevmasm/ConstantOptimiser.cpp +++ b/libevmasm/ConstantOptimiser.cpp @@ -194,7 +194,7 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value) // Is not always better, try literal and decomposition method. AssemblyItems routine{u256(_value)}; bigint bestGas = gasNeeded(routine); - for (unsigned bits = 255; bits > 8; --bits) + for (unsigned bits = 255; bits > 8 && m_maxSteps > 0; --bits) { unsigned gapDetector = unsigned(_value >> (bits - 8)) & 0x1ff; if (gapDetector != 0xff && gapDetector != 0x100) @@ -219,6 +219,8 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value) else if (lowerPart < 0) newRoutine.push_back(Instruction::SUB); + if (m_maxSteps > 0) + m_maxSteps--; bigint newGas = gasNeeded(newRoutine); if (newGas < bestGas) { |