cerc-io/solidity
10
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

IRGeneratorForStatements: Slightly reorganize local variables in endVisit(MemberAccess)

Browse Source 
- Add memberFunctionType accessible in the whole function to avoid declaring it multiple times
- Add objectCategory
This commit is contained in:
Kamil Śliwak 2020-05-19 13:02:51 +02:00
parent 87c598863f
commit a68b4ab7ed
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -1221,13 +1221,13 @@ void IRGeneratorForStatements::endVisit(FunctionCallOptions const& _options)
void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess) void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
{ {
ASTString const& member = _memberAccess.memberName(); ASTString const& member = _memberAccess.memberName();
if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type)) auto memberFunctionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
if (funType->bound()) Type::Category objectCategory = _memberAccess.expression().annotation().type->category();
{
solUnimplementedAssert(false, "");
}
switch (_memberAccess.expression().annotation().type->category()) if (memberFunctionType && memberFunctionType->bound())
solUnimplementedAssert(false, "");
switch (objectCategory)
{ {
case Type::Category::Contract: case Type::Category::Contract:
{ {
@ -1460,9 +1460,9 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
{ {
if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration)) if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
handleVariableReference(*variable, _memberAccess); handleVariableReference(*variable, _memberAccess);
else if (auto const* funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type)) else if (memberFunctionType)
{ {
switch (funType->kind()) switch (memberFunctionType->kind())
{ {
case FunctionType::Kind::Declaration: case FunctionType::Kind::Declaration:
break; break;
@ -1481,7 +1481,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
break; break;
case FunctionType::Kind::DelegateCall: case FunctionType::Kind::DelegateCall:
define(IRVariable(_memberAccess).part("address"), _memberAccess.expression()); define(IRVariable(_memberAccess).part("address"), _memberAccess.expression());
define(IRVariable(_memberAccess).part("functionIdentifier")) << formatNumber(funType->externalIdentifier()) << "\n"; define(IRVariable(_memberAccess).part("functionIdentifier")) << formatNumber(memberFunctionType->externalIdentifier()) << "\n";
break; break;
case FunctionType::Kind::External: case FunctionType::Kind::External:
case FunctionType::Kind::Creation: case FunctionType::Kind::Creation: