aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/codegen/ExpressionCompiler.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-02-13 16:49:50 +0800
committerchriseth <chris@ethereum.org>2018-02-13 18:00:59 +0800
commit5916cf1e0ace5d9855af4d785c22c742cf106b8a (patch)
tree086046177d246cbdec3e8907445dff0e36bca24a /libsolidity/codegen/ExpressionCompiler.cpp
parent729c6a95f8615586969e206b0b796011b3824adf (diff)
downloaddexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar.gz
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar.bz2
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar.lz
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar.xz
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.tar.zst
dexon-solidity-5916cf1e0ace5d9855af4d785c22c742cf106b8a.zip
Allow `this.f.selector` to be pure.
Diffstat (limited to 'libsolidity/codegen/ExpressionCompiler.cpp')
-rw-r--r--libsolidity/codegen/ExpressionCompiler.cpp24
1 files changed, 24 insertions, 0 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index bb8c4a94..8e1cf019 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1014,6 +1014,30 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
_memberAccess.expression().accept(*this);
return false;
}
+ // Another special case for `this.f.selector` which does not need the address.
+ // There are other uses of `.selector` which do need the address, but we want this
+ // specific use to be a pure expression.
+ if (
+ _memberAccess.expression().annotation().type->category() == Type::Category::Function &&
+ member == "selector"
+ )
+ if (auto const* expr = dynamic_cast<MemberAccess const*>(&_memberAccess.expression()))
+ if (auto const* exprInt = dynamic_cast<Identifier const*>(&expr->expression()))
+ if (exprInt->name() == "this")
+ if (Declaration const* declaration = expr->annotation().referencedDeclaration)
+ {
+ u256 identifier;
+ if (auto const* variable = dynamic_cast<VariableDeclaration const*>(declaration))
+ identifier = FunctionType(*variable).externalIdentifier();
+ else if (auto const* function = dynamic_cast<FunctionDefinition const*>(declaration))
+ identifier = FunctionType(*function).externalIdentifier();
+ else
+ solAssert(false, "Contract member is neither variable nor function.");
+ m_context << identifier;
+ /// need to store store it as bytes4
+ utils().leftShiftNumberOnStack(224);
+ return false;
+ }
_memberAccess.expression().accept(*this);
switch (_memberAccess.expression().annotation().type->category())