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/CompilerContext.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/CompilerContext.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 0bf88267..47333046 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -193,14 +193,22 @@ Declaration const* CompilerContext::nextFunctionToCompile() const return m_functionCompilationQueue.nextFunctionToCompile(); } -ModifierDefinition const& CompilerContext::functionModifier(string const& _name) const +ModifierDefinition const& CompilerContext::resolveVirtualFunctionModifier( + ModifierDefinition const& _modifier +) const { + // Libraries do not allow inheritance and their functions can be inlined, so we should not + // search the inheritance hierarchy (which will be the wrong one in case the function + // is inlined). + if (auto scope = dynamic_cast<ContractDefinition const*>(_modifier.scope())) + if (scope->isLibrary()) + return _modifier; solAssert(!m_inheritanceHierarchy.empty(), "No inheritance hierarchy set."); for (ContractDefinition const* contract: m_inheritanceHierarchy) for (ModifierDefinition const* modifier: contract->functionModifiers()) - if (modifier->name() == _name) + if (modifier->name() == _modifier.name()) return *modifier; - solAssert(false, "Function modifier " + _name + " not found."); + solAssert(false, "Function modifier " + _modifier.name() + " not found in inheritance hierarchy."); } unsigned CompilerContext::baseStackOffsetOfVariable(Declaration const& _declaration) const |