aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-02-07 02:35:18 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-02-07 04:17:52 +0800
commit693226b1abc8e0557943482b9ca23b61e859ceba (patch)
tree65edb0066f588cf8d5f2859a41e9f50cde238841 /libsolidity
parent3cbdafcfe947eafef7b8f6bbafd06f769261ae28 (diff)
downloaddexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar.gz
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar.bz2
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar.lz
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar.xz
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.tar.zst
dexon-solidity-693226b1abc8e0557943482b9ca23b61e859ceba.zip
Rename SUICIDE opcode to SELFDESTRUCT in libevmasm
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/codegen/ExpressionCompiler.cpp2
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index b66a3e12..d74d9dd3 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -648,7 +648,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
case Location::Selfdestruct:
arguments.front()->accept(*this);
utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true);
- m_context << Instruction::SUICIDE;
+ m_context << Instruction::SELFDESTRUCT;
break;
case Location::SHA3:
{
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;
}