diff options
| author | chriseth <chris@ethereum.org> | 2017-01-13 20:05:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 20:05:02 +0800 |
| commit | 60cc1668517f56ce6ca8225555472e7a27eab8b0 (patch) | |
| tree | 8eac35131efc4beeee921356052375233edd7102 /libevmasm/PeepholeOptimiser.cpp | |
| parent | 822622cf5bf23e79a6e2292cb837d1a39ca1c419 (diff) | |
| parent | e22672b7c739dde9f37a919e63245abda4b1fc89 (diff) | |
| download | dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.gz dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.bz2 dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.lz dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.xz dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.tar.zst dexon-solidity-60cc1668517f56ce6ca8225555472e7a27eab8b0.zip | |
Merge pull request #1561 from ethereum/develop
Merge develop into release for 0.4.8
Diffstat (limited to 'libevmasm/PeepholeOptimiser.cpp')
| -rw-r--r-- | libevmasm/PeepholeOptimiser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp index b96b0295..923ffa67 100644 --- a/libevmasm/PeepholeOptimiser.cpp +++ b/libevmasm/PeepholeOptimiser.cpp @@ -120,7 +120,7 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop, 2> if (instructionInfo(instr).ret == 1 && !instructionInfo(instr).sideEffects) { for (int j = 0; j < instructionInfo(instr).args; j++) - *_out = Instruction::POP; + *_out = {Instruction::POP, _op.location()}; return true; } } |