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/inlineasm | |
| parent | 254b55728f66ea164e9085700a294ac4837f2029 (diff) | |
| parent | dcb7c51920a947e57371b7dc92417f47ee5cc65c (diff) | |
| download | dexon-solidity-d4a57d81ba7f2a9b5db57397d36f1a17adb4b142.tar.gz 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/inlineasm')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 0f836406..3200b360 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -200,6 +200,8 @@ std::map<string, dev::solidity::Instruction> const& Parser::instructions() // add alias for suicide s_instructions["suicide"] = solidity::Instruction::SELFDESTRUCT; + // add alis for sha3 + s_instructions["sha3"] = solidity::Instruction::KECCAK256; } return s_instructions; } |