aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmParser.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-02-07 18:13:45 +0800
committerGitHub <noreply@github.com>2017-02-07 18:13:45 +0800
commit277415be30588e9694552c43bdbc70cc93aab94a (patch)
treeae9b0621382a22141f2be4f839bdbd36f2a5a7db /libsolidity/inlineasm/AsmParser.cpp
parent48f0da16b7cf820b276b97bbc41bf5daef201de5 (diff)
parent02a840f92474bfaded14a4412902b6ea35132f95 (diff)
downloaddexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.gz
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.bz2
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.lz
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.xz
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.tar.zst
dexon-solidity-277415be30588e9694552c43bdbc70cc93aab94a.zip
Merge pull request #1660 from ethereum/asm-selfdestruct
Rename SUICIDE opcode to SELFDESTRUCT in libevmasm
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.cpp')
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index fcc92dbb..46a2730d 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -152,8 +152,8 @@ std::map<string, dev::solidity::Instruction> const& Parser::instructions()
s_instructions[name] = instruction.second;
}
- // add alias for selfdestruct
- s_instructions["selfdestruct"] = solidity::Instruction::SUICIDE;
+ // add alias for suicide
+ s_instructions["suicide"] = solidity::Instruction::SELFDESTRUCT;
}
return s_instructions;
}