Merge pull request #5979 from ethereum/fix-context-for-hint

Make sure "value" error hint is only displayed in the right context

libsolidity/analysis/TypeChecker.cpp

@@ -2046,20 +2046,24 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 		}
 		string errorMsg = "Member \"" + memberName + "\" not found or not visible "
 				"after argument-dependent lookup in " + exprType->toString() + ".";
-		if (memberName == "value")
+
-		{
+		if (auto const& funType = dynamic_pointer_cast<FunctionType const>(exprType))
-			errorMsg.pop_back();
-			errorMsg +=	" - did you forget the \"payable\" modifier?";
-		}
-		else if (auto const& funType = dynamic_pointer_cast<FunctionType const>(exprType))
 		{
 			auto const& t = funType->returnParameterTypes();
-			if (t.size() == 1)
+
-				if (
+			if (memberName == "value")
-					t.front()->category() == Type::Category::Contract ||
+			{
-					t.front()->category() == Type::Category::Struct
+				if (funType->kind() == FunctionType::Kind::Creation)
-				)
+					errorMsg = "Constructor for " + t.front()->toString() + " must be payable for member \"value\" to be available.";
-					errorMsg += " Did you intend to call the function?";
+				else
+					errorMsg = "Member \"value\" is only available for payable functions.";
+			}
+			else if (
+				t.size() == 1 &&
+				(t.front()->category() == Type::Category::Struct ||
+				t.front()->category() == Type::Category::Contract)
+			)
+				errorMsg += " Did you intend to call the function?";
 		}
 		else if (exprType->category() == Type::Category::Contract)
 		{

test/libsolidity/SolidityNameAndTypeResolution.cpp

@@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE(address_staticcall_value)
 				}
 			}
 		)";
-		CHECK_ERROR(sourceCode, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
+		CHECK_ERROR(sourceCode, TypeError, "Member \"value\" is only available for payable functions.");
 	}
 }
 

test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol

@@ -0,0 +1,7 @@
+contract C {
+  // Tests that we don't get a wrong error about constructors
+  function f() public view returns (C) { return this; }
+  function g() public { this.f.value(); }
+}
+// ----
+// TypeError: (155-167): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol

@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (94-101): Member "value" not found or not visible after argument-dependent lookup in function (uint256) external returns (uint256) - did you forget the "payable" modifier?
+// TypeError: (94-101): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol

@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError: (87-96): Member "value" not found or not visible after argument-dependent lookup in function () - did you forget the "payable" modifier?
+// TypeError: (87-96): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol

@@ -3,4 +3,4 @@ contract test {
     function f() public { (new receiver()).nopay.value(10)(); }
 }
 // ----
-// TypeError: (91-119): Member "value" not found or not visible after argument-dependent lookup in function () external - did you forget the "payable" modifier?
+// TypeError: (91-119): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol

@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError: (106-119): Member "value" not found or not visible after argument-dependent lookup in function () returns (contract C) - did you forget the "payable" modifier?
+// TypeError: (106-119): Constructor for contract C must be payable for member "value" to be available.

test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32) - did you forget the "payable" modifier?
+// TypeError: (47-62): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (47-59): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32) - did you forget the "payable" modifier?
+// TypeError: (47-59): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes20) - did you forget the "payable" modifier?
+// TypeError: (47-62): Member "value" is only available for payable functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol

@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes32,uint8,bytes32,bytes32) pure returns (address) - did you forget the "payable" modifier?
+// TypeError: (47-62): Member "value" is only available for payable functions.