Merge pull request #5416 from ethereum/develop

Merge develop into release for 0.5.0

1 files changed, 4 insertions, 4 deletions

diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
index a3ce6a74..ba6e9916 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
@@ -2,10 +2,10 @@ contract D {
   struct S { uint a; uint b; }
 }
 contract C {
-  function f() internal returns (uint, uint, uint, D.S[20] storage, uint) {
-    (,,,D.S[10*2] storage x,) = f();
+  function f() internal pure {
+    (,,,D.S[10*2] storage x,) = g();
     x;
   }
-} 
+  function g() internal pure returns (uint, uint, uint, D.S[20] storage x, uint) { x = x; }
+}
 // ----
-// Warning: (110-117): 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.