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

Fix qualified modifier lookup.

Browse Source
This commit is contained in:
chriseth
2020-11-17 18:33:45 +01:00
parent 3957fb8191
commit e64fd99fb5
3 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/codegen/ContractCompiler.cpp
+9 -4
View File
@@ -1301,11 +1301,16 @@ void ContractCompiler::appendModifierOrFunctionCode()
appendModifierOrFunctionCode();
else
{
solAssert(*modifierInvocation->name().annotation().requiredLookup == VirtualLookup::Virtual, "");
ModifierDefinition const& modifier = dynamic_cast<ModifierDefinition const&>(
ModifierDefinition const& referencedModifier = dynamic_cast<ModifierDefinition const&>(
*modifierInvocation->name().annotation().referencedDeclaration
).resolveVirtual(m_context.mostDerivedContract());
);
VirtualLookup lookup = *modifierInvocation->name().annotation().requiredLookup;
solAssert(lookup == VirtualLookup::Virtual || lookup == VirtualLookup::Static, "");
ModifierDefinition const& modifier =
lookup == VirtualLookup::Virtual ?
referencedModifier.resolveVirtual(m_context.mostDerivedContract()) :
referencedModifier;
CompilerContext::LocationSetter locationSetter(m_context, modifier);
std::vector<ASTPointer<Expression>> const& modifierArguments =
modifierInvocation->arguments() ? *modifierInvocation->arguments() : std::vector<ASTPointer<Expression>>();