diff options
| author | chriseth <chris@ethereum.org> | 2018-03-15 01:07:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-15 01:07:55 +0800 |
| commit | 78abe81f0874f65b02ddc0529b4bd0ce93fa52a2 (patch) | |
| tree | d8d1e8db2f7012aaabb84f134594ee4afa6a201e /libsolidity/codegen/ContractCompiler.cpp | |
| parent | eecc26deec1815191bc3405e54ef84daaba853a1 (diff) | |
| parent | d0c96d53e90be5e58d8fef2e77fbd71baf2027ba (diff) | |
| download | dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar.gz dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar.bz2 dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar.lz dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar.xz dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.tar.zst dexon-solidity-78abe81f0874f65b02ddc0529b4bd0ce93fa52a2.zip | |
Merge branch 'develop' into externalFunctionsInLibraries
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) |