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

Extra asserts, test renaming, test for super in modifiers

Browse Source
This commit is contained in:
Kamil Śliwak 2021-06-01 17:13:50 +02:00
parent 4cbf9ff74c
commit 67e87147b4
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/codegen/CompilerContext.cpp
View File

@ -286,7 +286,11 @@ FunctionDefinition const& CompilerContext::superFunction(FunctionDefinition cons
solAssert(m_mostDerivedContract, "No most derived contract set.");
ContractDefinition const* super = _base.superContract(mostDerivedContract());
solAssert(super, "Super contract not available.");
return _function.resolveVirtual(mostDerivedContract(), super);
FunctionDefinition const& resolvedFunction = _function.resolveVirtual(mostDerivedContract(), super);
solAssert(resolvedFunction.isImplemented(), "");
return resolvedFunction;
}
ContractDefinition const& CompilerContext::mostDerivedContract() const

2
libsolidity/codegen/ContractCompiler.cpp
View File

@ -604,6 +604,8 @@ bool ContractCompiler::visit(VariableDeclaration const& _variableDeclaration)
bool ContractCompiler::visit(FunctionDefinition const& _function)
{
solAssert(_function.isImplemented(), "");
CompilerContext::LocationSetter locationSetter(m_context, _function);
m_context.startFunction(_function);

0
test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_fail.sol → test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_implemented_with_unimplemented.sol
View File

0
test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_fine.sol → test/libsolidity/syntaxTests/inheritance/override/override_unimplemented_and_unimplemented_with_unimplemented.sol
View File

9
test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol Normal file
View File

@ -0,0 +1,9 @@
contract C {
modifier m() { _; }
}
contract D is C {
function f() super.m public {
}
}
// ----
// DeclarationError 7920: (74-81): Identifier not found or not unique.