diff options
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 21 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 50 |
2 files changed, 64 insertions, 7 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index c2fd3e7e..6b2c1cb8 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -831,12 +831,21 @@ void TypeChecker::endVisit(ExpressionStatement const& _statement) if (!dynamic_cast<RationalNumberType const&>(*type(_statement.expression())).mobileType()) typeError(_statement.expression().location(), "Invalid rational number."); - bool unusedReturnValue = true; - if (auto t = dynamic_cast<TupleType const*>(type(_statement.expression()).get())) - if (t->components().empty()) - unusedReturnValue = false; - if (unusedReturnValue) - warning(_statement.location(), "Unused return value."); + if (auto call = dynamic_cast<FunctionCall const*>(&_statement.expression())) + { + if (auto callType = dynamic_cast<FunctionType const*>(type(call->expression()).get())) + { + using Location = FunctionType::Location; + Location location = callType->location(); + if ( + location == Location::Bare || + location == Location::BareCallCode || + location == Location::BareDelegateCall || + location == Location::Send + ) + warning(_statement.location(), "Return value of low-level calls not used."); + } + } } bool TypeChecker::visit(Conditional const& _conditional) diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 1f42c23e..7e81bd7e 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -3760,7 +3760,7 @@ BOOST_AUTO_TEST_CASE(unused_return_value) } } )"; - BOOST_CHECK(expectError(text, true) == Error::Type::Warning); + BOOST_CHECK(success(text)); } BOOST_AUTO_TEST_CASE(unused_return_value_send) @@ -3775,6 +3775,54 @@ BOOST_AUTO_TEST_CASE(unused_return_value_send) BOOST_CHECK(expectError(text, true) == Error::Type::Warning); } +BOOST_AUTO_TEST_CASE(unused_return_value_call) +{ + char const* text = R"( + contract test { + function f() { + address(0x12).call("abc"); + } + } + )"; + BOOST_CHECK(expectError(text, true) == Error::Type::Warning); +} + +BOOST_AUTO_TEST_CASE(unused_return_value_call_value) +{ + char const* text = R"( + contract test { + function f() { + address(0x12).call.value(2)("abc"); + } + } + )"; + BOOST_CHECK(expectError(text, true) == Error::Type::Warning); +} + +BOOST_AUTO_TEST_CASE(unused_return_value_callcode) +{ + char const* text = R"( + contract test { + function f() { + address(0x12).callcode("abc"); + } + } + )"; + BOOST_CHECK(expectError(text, true) == Error::Type::Warning); +} + +BOOST_AUTO_TEST_CASE(unused_return_value_delegatecall) +{ + char const* text = R"( + contract test { + function f() { + address(0x12).delegatecall("abc"); + } + } + )"; + BOOST_CHECK(expectError(text, true) == Error::Type::Warning); +} + BOOST_AUTO_TEST_SUITE_END() } |