diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2016-10-05 18:59:16 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2016-10-06 19:44:33 +0800 |
| commit | 6afdee5958624a41fcb8f136d1a18f1d8dd816bb (patch) | |
| tree | 8b38f77fe9effb580f778faf41a5d10bf5e0247a | |
| parent | d5cfb17b32147e950a689a507e0d5487dece7e8a (diff) | |
| download | dexon-solidity-6afdee5958624a41fcb8f136d1a18f1d8dd816bb.tar.gz dexon-solidity-6afdee5958624a41fcb8f136d1a18f1d8dd816bb.tar.zst dexon-solidity-6afdee5958624a41fcb8f136d1a18f1d8dd816bb.zip | |
Support both suicide/selfdestruct in inline assembly
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md index a454f651..8e639a2d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ ### 0.4.3 (unreleased) +Features: + * Inline assembly: support both `sucide` and `selfdestruct` opcodes + (note: `suicide` is deprecated) + ### 0.4.2 (2016-09-17) Bugfixes: diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 5c7163ee..196b314d 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -133,6 +133,7 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher) // Allowed instructions, lowercase names. static map<string, dev::solidity::Instruction> s_instructions; if (s_instructions.empty()) + { for (auto const& instruction: solidity::c_instructions) { if ( @@ -141,12 +142,14 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher) ) continue; string name = instruction.first; - if (instruction.second == solidity::Instruction::SUICIDE) - name = "selfdestruct"; transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); }); s_instructions[name] = instruction.second; } + // add alias for selfdestruct + s_instructions["selfdestruct"] = solidity::Instruction::SUICIDE; + } + Statement ret; switch (m_scanner->currentToken()) { |