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

Bugfix in virtual lookup for modifiers in libraries.

Browse Source
This commit is contained in:
chriseth 2018-03-13 16:50:44 +01:00
parent 8ad0fb3be3
commit 069b150e42
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/codegen/CompilerContext.cpp
View File

@ -193,14 +193,22 @@ Declaration const* CompilerContext::nextFunctionToCompile() const
return m_functionCompilationQueue.nextFunctionToCompile(); 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."); solAssert(!m_inheritanceHierarchy.empty(), "No inheritance hierarchy set.");
for (ContractDefinition const* contract: m_inheritanceHierarchy) for (ContractDefinition const* contract: m_inheritanceHierarchy)
for (ModifierDefinition const* modifier: contract->functionModifiers()) for (ModifierDefinition const* modifier: contract->functionModifiers())
if (modifier->name() == _name) if (modifier->name() == _modifier.name())
return *modifier; 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 unsigned CompilerContext::baseStackOffsetOfVariable(Declaration const& _declaration) const

2
libsolidity/codegen/CompilerContext.h
View File

@ -130,7 +130,7 @@ public:
void appendMissingLowLevelFunctions(); void appendMissingLowLevelFunctions();
ABIFunctions& abiFunctions() { return m_abiFunctions; } ABIFunctions& abiFunctions() { return m_abiFunctions; }
ModifierDefinition const& functionModifier(std::string const& _name) const; ModifierDefinition const& resolveVirtualFunctionModifier(ModifierDefinition const& _modifier) const;
/// Returns the distance of the given local variable from the bottom of the stack (of the current function). /// Returns the distance of the given local variable from the bottom of the stack (of the current function).
unsigned baseStackOffsetOfVariable(Declaration const& _declaration) const; unsigned baseStackOffsetOfVariable(Declaration const& _declaration) const;
/// If supplied by a value returned by @ref baseStackOffsetOfVariable(variable), returns /// If supplied by a value returned by @ref baseStackOffsetOfVariable(variable), returns

5
libsolidity/codegen/ContractCompiler.cpp
View File

@ -1002,7 +1002,10 @@ void ContractCompiler::appendModifierOrFunctionCode()
appendModifierOrFunctionCode(); appendModifierOrFunctionCode();
else 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); CompilerContext::LocationSetter locationSetter(m_context, modifier);
solAssert(modifier.parameters().size() == modifierInvocation->arguments().size(), ""); solAssert(modifier.parameters().size() == modifierInvocation->arguments().size(), "");
for (unsigned i = 0; i < modifier.parameters().size(); ++i) for (unsigned i = 0; i < modifier.parameters().size(); ++i)