cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support both suicide/selfdestruct in inline assembly

Browse Source
This commit is contained in:
Alex Beregszaszi 2016-10-05 11:59:16 +01:00
parent d5cfb17b32
commit 6afdee5958
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@ -1,5 +1,9 @@
### 0.4.3 (unreleased) ### 0.4.3 (unreleased)
Features:
* Inline assembly: support both `sucide` and `selfdestruct` opcodes
(note: `suicide` is deprecated)
### 0.4.2 (2016-09-17) ### 0.4.2 (2016-09-17)
Bugfixes: Bugfixes:

7
libsolidity/inlineasm/AsmParser.cpp
View File

@ -133,6 +133,7 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
// Allowed instructions, lowercase names. // Allowed instructions, lowercase names.
static map<string, dev::solidity::Instruction> s_instructions; static map<string, dev::solidity::Instruction> s_instructions;
if (s_instructions.empty()) if (s_instructions.empty())
{
for (auto const& instruction: solidity::c_instructions) for (auto const& instruction: solidity::c_instructions)
{ {
if ( if (
@ -141,12 +142,14 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
) )
continue; continue;
string name = instruction.first; 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); }); transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); });
s_instructions[name] = instruction.second; s_instructions[name] = instruction.second;
} }
// add alias for selfdestruct
s_instructions["selfdestruct"] = solidity::Instruction::SUICIDE;
}
Statement ret; Statement ret;
switch (m_scanner->currentToken()) switch (m_scanner->currentToken())
{ {