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

Disable unimplemented library functions instead

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-08-08 11:59:55 +01:00
parent 1ada48f61e
commit 8df89c5d5b
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@ -7,9 +7,9 @@ Bugfixes:
* Code Generator: ``.delegatecall()`` should always return execution outcome. * Code Generator: ``.delegatecall()`` should always return execution outcome.
* Code Generator: Provide "new account gas" for low-level ``callcode`` and ``delegatecall``. * Code Generator: Provide "new account gas" for low-level ``callcode`` and ``delegatecall``.
* Type Checker: Constructors must be implemented if declared. * Type Checker: Constructors must be implemented if declared.
* Type Checker: Do not mark overloaded functions as shadowing other functions.
* Type Checker: Disallow the ``.gas()`` modifier on ``ecrecover``, ``sha256`` and ``ripemd160``. * Type Checker: Disallow the ``.gas()`` modifier on ``ecrecover``, ``sha256`` and ``ripemd160``.
* Type Checker: Raise error when using unimplemented internal library functions. * Type Checker: Do not mark overloaded functions as shadowing other functions.
* Type Checker: Internal library functions must be implemented if declared.
### 0.4.14 (2017-07-31) ### 0.4.14 (2017-07-31)

17
libsolidity/analysis/TypeChecker.cpp
View File

@ -518,6 +518,8 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
_function.body().accept(*this); _function.body().accept(*this);
else if (_function.isConstructor()) else if (_function.isConstructor())
m_errorReporter.typeError(_function.location(), "Constructor must be implemented if declared."); m_errorReporter.typeError(_function.location(), "Constructor must be implemented if declared.");
else if (isLibraryFunction && _function.visibility() <= FunctionDefinition::Visibility::Internal)
m_errorReporter.typeError(_function.location(), "Internal library function must be implemented if declared.");
return false; return false;
} }
@ -1403,21 +1405,6 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
else else
_functionCall.annotation().type = make_shared<TupleType>(functionType->returnParameterTypes()); _functionCall.annotation().type = make_shared<TupleType>(functionType->returnParameterTypes());
// Internal library functions must be implemented, because of inlining rules.
if (
functionType->kind() == FunctionType::Kind::Internal &&
functionType->hasDeclaration() &&
dynamic_cast<FunctionDefinition const*>(&functionType->declaration())
)
{
FunctionDefinition const* function = dynamic_cast<FunctionDefinition const*>(&functionType->declaration());
bool isLibraryFunction =
dynamic_cast<ContractDefinition const*>(function->scope()) &&
dynamic_cast<ContractDefinition const*>(function->scope())->isLibrary();
if (!function->isImplemented() && isLibraryFunction)
m_errorReporter.typeError(_functionCall.location(), "Inlined library function is lacking implementation.");
}
TypePointers parameterTypes = functionType->parameterTypes(); TypePointers parameterTypes = functionType->parameterTypes();
if (!functionType->takesArbitraryParameters() && parameterTypes.size() != arguments.size()) if (!functionType->takesArbitraryParameters() && parameterTypes.size() != arguments.size())
{ {

32
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -6536,28 +6536,26 @@ BOOST_AUTO_TEST_CASE(constructor_without_implementation)
CHECK_ERROR(text, TypeError, "Constructor must be implemented if declared."); CHECK_ERROR(text, TypeError, "Constructor must be implemented if declared.");
} }
BOOST_AUTO_TEST_CASE(calling_unimplemented_internal_functions) BOOST_AUTO_TEST_CASE(library_function_without_implementation)
{
char const* text = R"(
contract C {
function f() internal;
function g() { f(); }
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
}
BOOST_AUTO_TEST_CASE(calling_unimplemented_internal_library_functions)
{ {
char const* text = R"( char const* text = R"(
library L { library L {
function f() internal; function f();
}
contract C {
function g() { L.f(); }
} }
)"; )";
CHECK_ERROR(text, TypeError, "Inlined library function is lacking implementation."); CHECK_SUCCESS_NO_WARNINGS(text);
text = R"(
library L {
function f() internal;
}
)";
CHECK_ERROR(text, TypeError, "Internal library function must be implemented if declared.");
text = R"(
library L {
function f() private;
}
)";
CHECK_ERROR(text, TypeError, "Internal library function must be implemented if declared.");
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()