Merge pull request #4738 from ethereum/dataloc_merged

Enforce data location.

1 files changed, 6 insertions, 12 deletions

diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol
index 7b953abb..ed6a9b37 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/224_string_bytes_conversion.sol
@@ -1,17 +1,11 @@
 contract Test {
     string s;
     bytes b;
-    function h(string _s) external { bytes(_s).length; }
-    function i(string memory _s) internal { bytes(_s).length; }
-    function j() internal { bytes(s).length; }
-    function k(bytes _b) external { string(_b); }
-    function l(bytes memory _b) internal { string(_b); }
-    function m() internal { string(b); }
+    function h(string calldata _s) pure external { bytes(_s).length; }
+    function i(string memory _s) pure internal { bytes(_s).length; }
+    function j() view internal { bytes(s).length; }
+    function k(bytes calldata _b) pure external { string(_b); }
+    function l(bytes memory _b) pure internal { string(_b); }
+    function m() view internal { string(b); }
 }
 // ----
-// Warning: (47-99): Function state mutability can be restricted to pure
-// Warning: (104-163): Function state mutability can be restricted to pure
-// Warning: (168-210): Function state mutability can be restricted to view
-// Warning: (215-260): Function state mutability can be restricted to pure
-// Warning: (265-317): Function state mutability can be restricted to pure
-// Warning: (322-358): Function state mutability can be restricted to view