diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-03-15 00:20:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 00:20:51 +0800 |
| commit | 59658afa30f434b3a2501c72d4a033af550462b0 (patch) | |
| tree | f258c7e625cc28efffc67abef04b0e0d3b0cf111 /libsolidity/codegen/ContractCompiler.cpp | |
| parent | c3f07b5294893414fd8ed1a04972fe52426ec9a9 (diff) | |
| parent | 51f9e350b152483968391757155189ed0880c755 (diff) | |
| download | dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar.gz dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar.bz2 dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar.lz dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar.xz dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.tar.zst dexon-solidity-59658afa30f434b3a2501c72d4a033af550462b0.zip | |
Merge pull request #3722 from ethereum/fixMods
Fix modifier lookup in libraries.
Diffstat (limited to 'libsolidity/codegen/ContractCompiler.cpp')
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 5a9498f0..95d6c8b5 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -1002,7 +1002,10 @@ void ContractCompiler::appendModifierOrFunctionCode() appendModifierOrFunctionCode(); else { - ModifierDefinition const& modifier = m_context.functionModifier(modifierInvocation->name()->name()); + ModifierDefinition const& nonVirtualModifier = dynamic_cast<ModifierDefinition const&>( + *modifierInvocation->name()->annotation().referencedDeclaration + ); + ModifierDefinition const& modifier = m_context.resolveVirtualFunctionModifier(nonVirtualModifier); CompilerContext::LocationSetter locationSetter(m_context, modifier); solAssert(modifier.parameters().size() == modifierInvocation->arguments().size(), ""); for (unsigned i = 0; i < modifier.parameters().size(); ++i) |