diff options
| author | chriseth <c@ethdev.com> | 2015-12-21 22:37:24 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-12-21 22:37:24 +0800 |
| commit | 6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e (patch) | |
| tree | 9cf3862fe47d52a542e3fb79f33612a7f6c7f18e /libsolidity/codegen | |
| parent | 6c6295b74e6e93d838672e70109880e27bb5f614 (diff) | |
| parent | 54e3637d234653e0f0e282220e3a628766a86adb (diff) | |
| download | dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar.gz dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar.bz2 dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar.lz dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar.xz dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.tar.zst dexon-solidity-6f78998aaf0bafe9fc68ffa4d0d37f2364d6f81e.zip | |
Merge pull request #309 from chriseth/fix_cross_contract_enum_access
Add structs and enums to contract types.
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/ExpressionCompiler.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp index dcdab2a7..2fd0b2c4 100644 --- a/libsolidity/codegen/ExpressionCompiler.cpp +++ b/libsolidity/codegen/ExpressionCompiler.cpp @@ -913,14 +913,16 @@ void ExpressionCompiler::endVisit(MemberAccess const& _memberAccess) if (dynamic_cast<ContractType const*>(type.actualType().get())) { - auto const& funType = dynamic_cast<FunctionType const&>(*_memberAccess.annotation().type); - if (funType.location() != FunctionType::Location::Internal) - m_context << funType.externalIdentifier(); - else + if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type.get())) { - auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration); - solAssert(!!function, "Function not found in member access"); - m_context << m_context.functionEntryLabel(*function).pushTag(); + if (funType->location() != FunctionType::Location::Internal) + m_context << funType->externalIdentifier(); + else + { + auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration); + solAssert(!!function, "Function not found in member access"); + m_context << m_context.functionEntryLabel(*function).pushTag(); + } } } else if (auto enumType = dynamic_cast<EnumType const*>(type.actualType().get())) |