From 58c6b9070530d91ca1c7851a55b106dba3a8be99 Mon Sep 17 00:00:00 2001
From: Djordje Mijovic <djordje.mijovic@gmail.com>
Date: Tue, 3 Mar 2020 12:15:59 +0100
Subject: [PATCH] Deprecated warning for .value() and .gas() on function and
 constructror calls

---
 Changelog.md                                   |  1 +
 docs/types/value-types.rst                     |  2 +-
 libsolidity/analysis/TypeChecker.cpp           | 18 +++++++++++++++++-
 .../semanticTests/tryCatch/assert.sol          |  2 +-
 .../semanticTests/tryCatch/trivial.sol         |  2 +-
 .../types/function_type_members.sol            |  3 +++
 .../constructor/constructor_payable.sol        | 10 ++++++++++
 .../functionCalls/calloptions_repeated.sol     |  1 +
 .../new_with_invalid_calloptions.sol           |  8 ++++----
 .../functionTypes/call_gas_on_function.sol     |  7 +++++++
 .../call_value_library_function.sol            | 10 ++++++++++
 ...call_value_on_non_payable_function_type.sol |  2 +-
 .../call_value_on_payable_function_type.sol    |  2 +-
 ...ue_options_on_non_payable_function_type.sol |  8 ++++++++
 .../warn_deprecate_gas_function.sol            |  8 ++++++++
 .../warn_deprecate_value_constructor.sol       | 11 +++++++++++
 .../warn_deprecate_value_function.sol          |  8 ++++++++
 .../348_unused_return_value_call_value.sol     |  3 +++
 .../361_calling_payable.sol                    |  9 +++++++--
 .../362_calling_nonpayable.sol                 |  6 ++++--
 ...not_warn_msg_value_in_internal_function.sol |  1 +
 ...unspecified_encoding_internal_functions.sol |  1 +
 .../viewPureChecker/gas_value_without_call.sol | 13 +++++++++++++
 .../gas_with_call_nonpayable.sol               | 15 +++++++++++++--
 .../viewPureChecker/staticcall_gas_view.sol    |  4 ++++
 .../value_with_call_nonpayable.sol             | 13 +++++++++++--
 26 files changed, 150 insertions(+), 18 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/constructor/constructor_payable.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/warn_deprecate_gas_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_constructor.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_function.sol

diff --git a/Changelog.md b/Changelog.md
index f151365ae..9a84d3012 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * Inline Assembly: Allow assigning to `_slot` of local storage variable pointers.
+ * General: Deprecated `value(...)` and `gas(...)` in favor of `{value: ...}` and `{gas: ...}`
 
 
 Compiler Features:
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 9dae37912..8984a5b8e 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -646,7 +646,7 @@ External (or public) functions have the following members:
 Example that shows how to use the members::
 
     pragma solidity >=0.4.16 <0.7.0;
-
+    // This will report a warning
 
     contract Example {
         function f() public payable returns (bytes4) {
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 2f9526f87..f713ea289 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2312,7 +2312,11 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 			else if (!expressionFunctionType->isPayable())
 				m_errorReporter.typeError(
 					_functionCallOptions.location(),
-					"Cannot set option \"value\" on a non-payable function type."
+					kind == FunctionType::Kind::Creation ?
+						"Cannot set option \"value\", since the constructor of " +
+						expressionFunctionType->returnParameterTypes().front()->toString() +
+						" is not payable." :
+						"Cannot set option \"value\" on a non-payable function type."
 				);
 			else
 			{
@@ -2522,12 +2526,24 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 	annotation.type = possibleMembers.front().type;
 
 	if (auto funType = dynamic_cast<FunctionType const*>(annotation.type))
+	{
 		solAssert(
 			!funType->bound() || exprType->isImplicitlyConvertibleTo(*funType->selfType()),
 			"Function \"" + memberName + "\" cannot be called on an object of type " +
 			exprType->toString() + " (expected " + funType->selfType()->toString() + ")."
 		);
 
+		if (
+			dynamic_cast<FunctionType const*>(exprType) &&
+			!annotation.referencedDeclaration &&
+			(memberName == "value" || memberName == "gas")
+		)
+			m_errorReporter.warning(
+				_memberAccess.location(),
+				"Using \"." + memberName + "(...)\" is deprecated. Use \"{" + memberName + ": ...}\" instead."
+			);
+	}
+
 	if (auto const* structType = dynamic_cast<StructType const*>(exprType))
 		annotation.isLValue = !structType->dataStoredIn(DataLocation::CallData);
 	else if (exprType->category() == Type::Category::Array)
diff --git a/test/libsolidity/semanticTests/tryCatch/assert.sol b/test/libsolidity/semanticTests/tryCatch/assert.sol
index 367ab287b..8b6a7b996 100644
--- a/test/libsolidity/semanticTests/tryCatch/assert.sol
+++ b/test/libsolidity/semanticTests/tryCatch/assert.sol
@@ -4,7 +4,7 @@ contract C {
     }
     function f(bool x) public returns (uint) {
         // Set the gas to make this work on pre-byzantium VMs
-        try this.g.gas(8000)(x) {
+        try this.g{gas: 8000}(x) {
             return 1;
         } catch {
             return 2;
diff --git a/test/libsolidity/semanticTests/tryCatch/trivial.sol b/test/libsolidity/semanticTests/tryCatch/trivial.sol
index e2f8739bd..d43477e99 100644
--- a/test/libsolidity/semanticTests/tryCatch/trivial.sol
+++ b/test/libsolidity/semanticTests/tryCatch/trivial.sol
@@ -4,7 +4,7 @@ contract C {
     }
     function f(bool x) public returns (uint) {
         // Set the gas to make this work on pre-byzantium VMs
-        try this.g.gas(8000)(x) {
+        try this.g{gas: 8000}(x) {
             return 1;
         } catch {
             return 2;
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_members.sol b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
index 2296fa798..923767dd7 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_members.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
@@ -3,9 +3,12 @@ contract C {
     function f(function(uint) external payable g) internal {
 		g.selector;
 		g.gas(2).value(3)(4);
+		g{gas: 2, value: 3}(4);
     }
 }
 // ----
+// Warning: (122-127): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (122-136): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
 // Warning: (108-118): Assertion checker does not yet support this expression.
 // Warning: (122-130): Assertion checker does not yet implement this type of function call.
 // Warning: (122-139): Assertion checker does not yet implement this type of function call.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_payable.sol b/test/libsolidity/syntaxTests/constructor/constructor_payable.sol
new file mode 100644
index 000000000..e5c6ac28d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/constructor_payable.sol
@@ -0,0 +1,10 @@
+contract C {
+    constructor() public payable { }
+}
+
+contract D {
+    function createC() public returns (C) {
+       C c = (new C){value: 1}();
+       return c;
+    }
+}
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
index 2ffe4b3ed..181b325b0 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
@@ -15,6 +15,7 @@ contract C {
 // TypeError: (78-110): Option "gas" has already been set.
 // TypeError: (120-154): Option "gas" has already been set.
 // TypeError: (164-198): Option "value" has already been set.
+// Warning: (208-222): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
 // TypeError: (208-242): Option "value" has already been set.
 // TypeError: (252-293): Option "value" has already been set.
 // TypeError: (252-293): Option "gas" has already been set.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
index a8cabe0de..29798dde6 100644
--- a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
@@ -14,14 +14,14 @@ contract C {
 // ====
 // EVMVersion: >=constantinople
 // ----
-// TypeError: (64-98): Cannot set option "value" on a non-payable function type.
+// TypeError: (64-98): Cannot set option "value", since the constructor of contract D is not payable.
 // TypeError: (64-98): Function call option "gas" cannot be used with "new".
 // TypeError: (102-123): Unknown call option "slt". Valid options are "salt", "value" and "gas".
-// TypeError: (102-123): Cannot set option "value" on a non-payable function type.
+// TypeError: (102-123): Cannot set option "value", since the constructor of contract D is not payable.
 // TypeError: (127-139): Unknown call option "val". Valid options are "salt", "value" and "gas".
 // TypeError: (143-172): Duplicate option "salt".
-// TypeError: (176-199): Cannot set option "value" on a non-payable function type.
-// TypeError: (176-199): Cannot set option "value" on a non-payable function type.
+// TypeError: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
+// TypeError: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
 // TypeError: (203-220): Unknown call option "random". Valid options are "salt", "value" and "gas".
 // TypeError: (224-242): Unknown call option "what". Valid options are "salt", "value" and "gas".
 // TypeError: (246-259): Function call option "gas" cannot be used with "new".
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol b/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol
new file mode 100644
index 000000000..381fb6ea0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/call_gas_on_function.sol
@@ -0,0 +1,7 @@
+contract C {
+    function (uint) external returns (uint) x;
+    function f() public {
+        x{gas: 2}(1);
+    }
+}
+
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol
new file mode 100644
index 000000000..97eebfd23
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_library_function.sol
@@ -0,0 +1,10 @@
+library L {
+    function value(function()internal a, uint256 b) internal {}
+}
+contract C {
+    using L for function()internal;
+    function f() public {
+        function()internal x;
+        x.value(42);
+    }
+}
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
index 5efdf2407..822d3eb28 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
@@ -1,7 +1,7 @@
 contract C {
     function (uint) external returns (uint) x;
     function f() public {
-        x.value(2)();
+        x.value(2)(1);
     }
 }
 // ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol
index ca2a01964..1fd0e7188 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_on_payable_function_type.sol
@@ -1,6 +1,6 @@
 contract C {
     function (uint) external payable returns (uint) x;
     function f() public {
-        x.value(2)(1);
+        x{value: 2}(1);
     }
 }
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
new file mode 100644
index 000000000..30f36f219
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
@@ -0,0 +1,8 @@
+contract C {
+    function (uint) external returns (uint) x;
+    function g() public {
+        x{value: 2}(1);
+    }
+}
+// ----
+// TypeError: (94-105): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_gas_function.sol b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_gas_function.sol
new file mode 100644
index 000000000..36d42e349
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_gas_function.sol
@@ -0,0 +1,8 @@
+contract C {
+    function (uint) external payable returns (uint) x;
+    function f() public {
+        x.gas(2)(1);
+    }
+}
+// ----
+// Warning: (102-107): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_constructor.sol
new file mode 100644
index 000000000..28a573c93
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_constructor.sol
@@ -0,0 +1,11 @@
+contract C {
+    constructor() payable public {}
+}
+contract D {
+    function createC() public returns (C) {
+        C c = (new C).value(2)();
+        return c;
+    }
+}
+// ----
+// Warning: (122-135): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_function.sol b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_function.sol
new file mode 100644
index 000000000..854ea28fa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/warn_deprecate_value_function.sol
@@ -0,0 +1,8 @@
+contract C {
+    function (uint) external payable returns (uint) x;
+    function f() public {
+        x.value(2)(1);
+    }
+}
+// ----
+// Warning: (102-109): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
index 1ac7c6f33..dffa55fdf 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/348_unused_return_value_call_value.sol
@@ -1,7 +1,10 @@
 contract test {
     function f() public {
         address(0x12).call.value(2)("abc");
+        address(0x12).call{value: 2}("abc");
     }
 }
 // ----
+// Warning: (50-74): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
 // Warning: (50-84): Return value of low-level calls not used.
+// Warning: (94-129): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol
index 8ef4d5799..a3c5a5f30 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/361_calling_payable.sol
@@ -1,6 +1,11 @@
 contract receiver { function pay() payable public {} }
 contract test {
-    function f() public { (new receiver()).pay.value(10)(); }
+    function f() public { (new receiver()).pay{value: 10}(); }
+    function g() public { (new receiver()).pay.value(10)(); }
     receiver r = new receiver();
-    function g() public { r.pay.value(10)(); }
+    function h() public { r.pay{value: 10}(); }
+    function i() public { r.pay.value(10)(); }
 }
+// ----
+// Warning: (160-186): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// Warning: (303-314): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
index 1c04be755..6f5706446 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
@@ -1,6 +1,8 @@
 contract receiver { function nopay() public {} }
 contract test {
-    function f() public { (new receiver()).nopay.value(10)(); }
+    function f() public { (new receiver()).nopay{value: 10}(); }
+    function g() public { (new receiver()).nopay.value(10)(); }
 }
 // ----
-// TypeError: (91-119): Member "value" is only available for payable functions.
+// TypeError: (91-124): Cannot set option "value" on a non-payable function type.
+// TypeError: (156-184): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol
index 8492e691e..00d8ad4c8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/399_does_not_warn_msg_value_in_internal_function.sol
@@ -3,3 +3,4 @@ contract C {
         msg.value;
     }
 }
+
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
index a30e428a6..ea11703f9 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
@@ -5,6 +5,7 @@ contract C {
     }
 }
 // ----
+// Warning: (105-115): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
 // TypeError: (91-100): This type cannot be encoded.
 // TypeError: (102-103): This type cannot be encoded.
 // TypeError: (105-115): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol
index 2df3bbe4f..77dab9af2 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/gas_value_without_call.sol
@@ -2,12 +2,25 @@ contract C {
     function f() external payable {}
 	function g(address a) external pure {
 		a.call.value(42);
+		a.call{value: 42};
 		a.call.gas(42);
+		a.call{gas: 42};
 		a.staticcall.gas(42);
+		a.staticcall{gas: 42};
 		a.delegatecall.gas(42);
+		a.delegatecall{gas: 42};
 	}
 	function h() external view {
 		this.f.value(42);
+		this.f{value: 42};
 		this.f.gas(42);
+		this.f{gas: 42};
 	}
 }
+// ----
+// Warning: (91-103): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// Warning: (132-142): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (169-185): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (218-236): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (304-316): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// Warning: (345-355): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
index 0a58a516c..4a0da038e 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
@@ -1,16 +1,27 @@
 contract C {
 	function f(address a) external view returns (bool success) {
 		(success,) = a.call.gas(42)("");
+		(success,) = a.call{gas: 42}("");
 	}
 	function g(address a) external view returns (bool success) {
 		(success,) = a.call.gas(42)("");
+		(success,) = a.call{gas: 42}("");
 	}
 	function h() external payable {}
 	function i() external view {
 		this.h.gas(42)();
 	}
+	function j() external view {
+		this.h{gas: 42}();
+	}
 }
 // ----
+// Warning: (90-100): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (226-236): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (351-361): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
 // TypeError: (90-108): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (190-208): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (279-295): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (125-144): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (226-244): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (261-280): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (351-367): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (404-421): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol
index 6f8b31bfc..2b4821c53 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/staticcall_gas_view.sol
@@ -3,9 +3,13 @@ contract C {
 	function test(address a) external view returns (bool status) {
 		// This used to incorrectly raise an error about violating the view mutability.
 		(status,) = a.staticcall.gas(42)("");
+		(status,) = a.staticcall{gas: 42}("");
 		this.f.gas(42)();
+		this.f{gas: 42}();
 	}
 }
 // ====
 // EVMVersion: >=byzantium
 // ----
+// Warning: (207-223): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// Warning: (276-286): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
index cf5d885c9..6b82f2fab 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
@@ -1,16 +1,25 @@
 contract C {
 	function f(address a) external view returns (bool success) {
 		(success,) = a.call.value(42)("");
+		(success,) = a.call{value: 42}("");
 	}
 	function g(address a) external view returns (bool success) {
 		(success,) = a.call.value(42)("");
+		(success,) = a.call{value: 42}("");
 	}
 	function h() external payable {}
 	function i() external view {
 		this.h.value(42)();
+		this.h{value: 42}();
 	}
 }
 // ----
+// Warning: (90-102): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// Warning: (230-242): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// Warning: (359-371): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
 // TypeError: (90-110): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (192-212): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError: (283-301): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (127-148): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (230-250): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (267-288): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (359-377): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError: (381-400): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.