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

Do not mark overloaded functions as shadowing

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-08-03 21:47:13 +01:00 committed by chriseth
parent dc0f85c4fb
commit 32acadf43d
4 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -5,6 +5,7 @@ Features:
Bugfixes: 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: 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``.
### 0.4.14 (2017-07-31) ### 0.4.14 (2017-07-31)

19
libsolidity/analysis/NameAndTypeResolver.cpp
View File

@ -439,6 +439,23 @@ DeclarationRegistrationHelper::DeclarationRegistrationHelper(
solAssert(m_currentScope == _currentScope, "Scopes not correctly closed."); solAssert(m_currentScope == _currentScope, "Scopes not correctly closed.");
} }
bool DeclarationRegistrationHelper::isOverloadedFunction(
Declaration const& _declaration1,
Declaration const& _declaration2
)
{
auto const* function1 = dynamic_cast<FunctionDefinition const*>(&_declaration1);
auto const* function2 = dynamic_cast<FunctionDefinition const*>(&_declaration2);
if (!function1 || !function2)
return false;
if (function1->parameters() != function2->parameters())
return true;
return false;
}
bool DeclarationRegistrationHelper::registerDeclaration( bool DeclarationRegistrationHelper::registerDeclaration(
DeclarationContainer& _container, DeclarationContainer& _container,
Declaration const& _declaration, Declaration const& _declaration,
@ -454,7 +471,7 @@ bool DeclarationRegistrationHelper::registerDeclaration(
Declaration const* shadowedDeclaration = nullptr; Declaration const* shadowedDeclaration = nullptr;
if (_warnOnShadow && !_declaration.name().empty()) if (_warnOnShadow && !_declaration.name().empty())
for (auto const* decl: _container.resolveName(_declaration.name(), true)) for (auto const* decl: _container.resolveName(_declaration.name(), true))
if (decl != &_declaration) if (decl != &_declaration && !isOverloadedFunction(*decl, _declaration))
{ {
shadowedDeclaration = decl; shadowedDeclaration = decl;
break; break;

2
libsolidity/analysis/NameAndTypeResolver.h
View File

@ -169,6 +169,8 @@ private:
void closeCurrentScope(); void closeCurrentScope();
void registerDeclaration(Declaration& _declaration, bool _opensScope); void registerDeclaration(Declaration& _declaration, bool _opensScope);
static bool isOverloadedFunction(Declaration const& _declaration1, Declaration const& _declaration2);
/// @returns the canonical name of the current scope. /// @returns the canonical name of the current scope.
std::string currentCanonicalName() const; std::string currentCanonicalName() const;

11
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -6190,6 +6190,17 @@ BOOST_AUTO_TEST_CASE(shadowing_builtins_ignores_constructor)
CHECK_SUCCESS_NO_WARNINGS(text); CHECK_SUCCESS_NO_WARNINGS(text);
} }
BOOST_AUTO_TEST_CASE(function_overload_is_not_shadowing)
{
char const* text = R"(
contract C {
function f() {}
function f(uint) {}
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
}
BOOST_AUTO_TEST_CASE(callable_crash) BOOST_AUTO_TEST_CASE(callable_crash)
{ {
char const* text = R"( char const* text = R"(