Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 5 insertions, 5 deletions

diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
index 8e06322c..a2fcce18 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
@@ -1,12 +1,12 @@
 contract C {
-  function f() internal returns (uint, uint, uint, uint) {
+  function f() internal pure returns (uint, uint, uint, uint) {
     (uint a, uint b,,) = f();
     a; b;
   }
-  function g() internal returns (bytes memory, string storage) {
-    (bytes memory a, string storage b) = g();
+  function g() internal pure {
+    (bytes memory a, string storage b) = h();
     a; b;
   }
-} 
+  function h() internal pure returns (bytes memory, string storage s) { s = s; }
+}
 // ----
-// Warning: (163-169): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.