diff options
| author | chriseth <chris@ethereum.org> | 2017-07-03 20:52:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 20:52:29 +0800 |
| commit | 76d3b7c5a160e1f550c710e6850ee6f116142ca1 (patch) | |
| tree | 93c96f7073617b4f56c8c355cdc30701aec4818b /libevmasm/CommonSubexpressionEliminator.cpp | |
| parent | 78969364608ba60d1654f4d1738886d13112b6cd (diff) | |
| parent | 2222ddecf49b5b901f63b9e7449ee76c9f51c47a (diff) | |
| download | dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar.gz dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar.bz2 dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar.lz dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar.xz dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.tar.zst dexon-solidity-76d3b7c5a160e1f550c710e6850ee6f116142ca1.zip | |
Merge pull request #2510 from ethereum/develop
Version 0.4.12
Diffstat (limited to 'libevmasm/CommonSubexpressionEliminator.cpp')
| -rw-r--r-- | libevmasm/CommonSubexpressionEliminator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp index fd4fffa6..70324e7f 100644 --- a/libevmasm/CommonSubexpressionEliminator.cpp +++ b/libevmasm/CommonSubexpressionEliminator.cpp @@ -234,7 +234,7 @@ void CSECodeGenerator::addDependencies(Id _c) if (expr.item && expr.item->type() == Operation && ( expr.item->instruction() == Instruction::SLOAD || expr.item->instruction() == Instruction::MLOAD || - expr.item->instruction() == Instruction::SHA3 + expr.item->instruction() == Instruction::KECCAK256 )) { // this loads an unknown value from storage or memory and thus, in addition to its @@ -260,7 +260,7 @@ void CSECodeGenerator::addDependencies(Id _c) case Instruction::MLOAD: knownToBeIndependent = m_expressionClasses.knownToBeDifferentBy32(slot, slotToLoadFrom); break; - case Instruction::SHA3: + case Instruction::KECCAK256: { Id length = expr.arguments.at(1); AssemblyItem offsetInstr(Instruction::SUB, expr.item->location()); |