diff options
| author | chriseth <chris@ethereum.org> | 2017-05-31 01:34:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 01:34:28 +0800 |
| commit | d4a57d81ba7f2a9b5db57397d36f1a17adb4b142 (patch) | |
| tree | 15d8048ad9ed48dc7d010e37fd2125df8d5db436 /libsolidity/codegen/CompilerUtils.cpp | |
| parent | 254b55728f66ea164e9085700a294ac4837f2029 (diff) | |
| parent | dcb7c51920a947e57371b7dc92417f47ee5cc65c (diff) | |
| download | dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.gz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.bz2 dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.lz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.xz dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.zst dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.zip | |
Merge pull request #2317 from ethereum/keccak256
Use keccak256 in tests and replace the SHA3 instruction in assembly
Diffstat (limited to 'libsolidity/codegen/CompilerUtils.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp index 4ae9a09a..3baaaddf 100644 --- a/libsolidity/codegen/CompilerUtils.cpp +++ b/libsolidity/codegen/CompilerUtils.cpp @@ -934,7 +934,7 @@ unsigned CompilerUtils::sizeOnStack(vector<shared_ptr<Type const>> const& _varia void CompilerUtils::computeHashStatic() { storeInMemory(0); - m_context << u256(32) << u256(0) << Instruction::SHA3; + m_context << u256(32) << u256(0) << Instruction::KECCAK256; } void CompilerUtils::storeStringData(bytesConstRef _data) |