Merge pull request #4478 from ethereum/requireStorageLocation

Turn missing storage locations into an error.

20 files changed, 53 insertions, 68 deletions

diff --git a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
index 6b10f17e..c2a6c3ef 100644
--- a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
+++ b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
@@ -225,7 +225,7 @@ contract MultiSigWallet {
         notExecuted(transactionId)
     {
         if (isConfirmed(transactionId)) {
-            Transaction tx = transactions[transactionId];
+            Transaction storage tx = transactions[transactionId];
             tx.executed = true;
             if (tx.destination.call.value(tx.value)(tx.data))
                 emit Execution(transactionId);
diff --git a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol b/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
index 3a68f662..c1b1d7ea 100644
--- a/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
+++ b/test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
@@ -42,7 +42,7 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
         public
         notExecuted(transactionId)
     {
-        Transaction tx = transactions[transactionId];
+        Transaction storage tx = transactions[transactionId];
         bool confirmed = isConfirmed(transactionId);
         if (confirmed || tx.data.length == 0 && isUnderLimit(tx.value)) {
             tx.executed = true;
diff --git a/test/compilationTests/milestonetracker/MilestoneTracker.sol b/test/compilationTests/milestonetracker/MilestoneTracker.sol
index fc7008cd..bc182f9d 100644
--- a/test/compilationTests/milestonetracker/MilestoneTracker.sol
+++ b/test/compilationTests/milestonetracker/MilestoneTracker.sol
@@ -227,7 +227,7 @@ contract MilestoneTracker {
 
             RLP.RLPItem memory itmProposal = itrProposals.next();
 
-            Milestone milestone = milestones[milestones.length ++];
+            Milestone storage milestone = milestones[milestones.length ++];
 
             if (!itmProposal.isList()) throw;
 
@@ -259,7 +259,7 @@ contract MilestoneTracker {
         public campaignNotCanceled notChanging
     {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if (  (msg.sender != milestone.milestoneLeadLink)
             &&(msg.sender != recipient))
             throw;
@@ -277,7 +277,7 @@ contract MilestoneTracker {
         public campaignNotCanceled notChanging
     {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if ((msg.sender != milestone.reviewer) ||
             (milestone.status != MilestoneStatus.Completed)) throw;
 
@@ -292,7 +292,7 @@ contract MilestoneTracker {
         public campaignNotCanceled notChanging
     {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if ((msg.sender != milestone.reviewer) ||
             (milestone.status != MilestoneStatus.Completed)) throw;
 
@@ -307,7 +307,7 @@ contract MilestoneTracker {
     function requestMilestonePayment(uint _idMilestone
         ) public campaignNotCanceled notChanging {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if (  (msg.sender != milestone.milestoneLeadLink)
             &&(msg.sender != recipient))
             throw;
@@ -324,7 +324,7 @@ contract MilestoneTracker {
         public onlyRecipient campaignNotCanceled notChanging
     {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if  ((milestone.status != MilestoneStatus.AcceptedAndInProgress) &&
              (milestone.status != MilestoneStatus.Completed))
             throw;
@@ -339,7 +339,7 @@ contract MilestoneTracker {
     function arbitrateApproveMilestone(uint _idMilestone
     ) public onlyArbitrator campaignNotCanceled notChanging {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         if  ((milestone.status != MilestoneStatus.AcceptedAndInProgress) &&
              (milestone.status != MilestoneStatus.Completed))
            throw;
@@ -356,7 +356,7 @@ contract MilestoneTracker {
     // @dev This internal function is executed when the milestone is paid out
     function authorizePayment(uint _idMilestone) internal {
         if (_idMilestone >= milestones.length) throw;
-        Milestone milestone = milestones[_idMilestone];
+        Milestone storage milestone = milestones[_idMilestone];
         // Recheck again to not pay twice
         if (milestone.status == MilestoneStatus.AuthorizedForPayment) throw;
         milestone.status = MilestoneStatus.AuthorizedForPayment;
diff --git a/test/compilationTests/zeppelin/token/VestedToken.sol b/test/compilationTests/zeppelin/token/VestedToken.sol
index 893a51db..48818c3f 100644
--- a/test/compilationTests/zeppelin/token/VestedToken.sol
+++ b/test/compilationTests/zeppelin/token/VestedToken.sol
@@ -74,7 +74,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
    * @param _grantId The id of the token grant.
    */
   function revokeTokenGrant(address _holder, uint256 _grantId) public {
-    TokenGrant grant = grants[_holder][_grantId];
+    TokenGrant storage grant = grants[_holder][_grantId];
 
     if (!grant.revokable) { // Check if grant was revokable
       throw;
@@ -193,7 +193,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
    * revokability, burnsOnRevoke, and vesting) plus the vested value at the current time.
    */
   function tokenGrant(address _holder, uint256 _grantId) public view returns (address granter, uint256 value, uint256 vested, uint64 start, uint64 cliff, uint64 vesting, bool revokable, bool burnsOnRevoke) {
-    TokenGrant grant = grants[_holder][_grantId];
+    TokenGrant storage grant = grants[_holder][_grantId];
 
     granter = grant.granter;
     value = grant.value;
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index 3d759aa0..0fc093e7 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -142,7 +142,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
 				throw;
 			bid(_name, msg.sender, msg.value);
 		} else {
-			Record record = m_toRecord[_name];
+			Record storage record = m_toRecord[_name];
 			if (record.owner != 0x0000000000000000000000000000000000000000)
 				throw;
 			m_toRecord[_name].owner = msg.sender;
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
index 87f801b0..aebdb053 100644
--- a/test/contracts/FixedFeeRegistrar.cpp
+++ b/test/contracts/FixedFeeRegistrar.cpp
@@ -75,7 +75,7 @@ contract FixedFeeRegistrar is Registrar {
 	modifier onlyrecordowner(string _name) { if (m_record(_name).owner == msg.sender) _; }
 
 	function reserve(string _name) payable {
-		Record rec = m_record(_name);
+		Record storage rec = m_record(_name);
 		if (rec.owner == 0x0000000000000000000000000000000000000000 && msg.value >= c_fee) {
 			rec.owner = msg.sender;
 			emit Changed(_name);
@@ -105,7 +105,7 @@ contract FixedFeeRegistrar is Registrar {
 	}
 
 	function record(string _name) view returns (address o_addr, address o_subRegistrar, bytes32 o_content, address o_owner) {
-		Record rec = m_record(_name);
+		Record storage rec = m_record(_name);
 		o_addr = rec.addr;
 		o_subRegistrar = rec.subRegistrar;
 		o_content = rec.content;
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index b3a096a3..45fe5bbd 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -119,7 +119,7 @@ contract multiowned {
 		// make sure they're an owner
 		if (ownerIndex == 0) return;
 		uint ownerIndexBit = 2**ownerIndex;
-		PendingState pending = m_pending[_operation];
+		PendingState storage pending = m_pending[_operation];
 		if (pending.ownersDone & ownerIndexBit > 0) {
 			pending.yetNeeded++;
 			pending.ownersDone -= ownerIndexBit;
@@ -178,7 +178,7 @@ contract multiowned {
 	}
 
 	function hasConfirmed(bytes32 _operation, address _owner) view returns (bool) {
-		PendingState pending = m_pending[_operation];
+		PendingState storage pending = m_pending[_operation];
 		uint ownerIndex = m_ownerIndex[uint(_owner)];
 
 		// make sure they're an owner
@@ -201,7 +201,7 @@ contract multiowned {
 		// make sure they're an owner
 		if (ownerIndex == 0) return;
 
-		PendingState pending = m_pending[_operation];
+		PendingState storage pending = m_pending[_operation];
 		// if we're not yet working on this operation, switch over and reset the confirmation status.
 		if (pending.yetNeeded == 0) {
 			// reset count of confirmations needed.
diff --git a/test/libsolidity/ASTJSON.cpp b/test/libsolidity/ASTJSON.cpp
index 03e74097..482b05e6 100644
--- a/test/libsolidity/ASTJSON.cpp
+++ b/test/libsolidity/ASTJSON.cpp
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(long_type_name_binary_operation)
 BOOST_AUTO_TEST_CASE(long_type_name_identifier)
 {
 	CompilerStack c;
-	c.addSource("a", "contract c { uint[] a; function f() public { uint[] b = a; } }");
+	c.addSource("a", "contract c { uint[] a; function f() public { uint[] storage b = a; } }");
 	c.setEVMVersion(dev::test::Options::get().evmVersion());
 	c.parseAndAnalyze();
 	map<string, unsigned> sourceIndices;
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 31412108..ad425d98 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1535,7 +1535,7 @@ BOOST_AUTO_TEST_CASE(struct_reference)
 			function set() public {
 				data.z = 2;
 				mapping(uint8 => s2) map = data.recursive;
-				s2 inner = map[0];
+				s2 storage inner = map[0];
 				inner.z = 3;
 				inner.recursive[0].z = inner.recursive[1].z + 1;
 			}
@@ -6374,7 +6374,7 @@ BOOST_AUTO_TEST_CASE(struct_assign_reference_to_struct)
 			}
 			function assign() public returns (uint ret_local, uint ret_global, uint ret_global3, uint ret_global1)
 			{
-				testStruct x = data1; //x is a reference data1.m_value == 2 as well as x.m_value = 2
+				testStruct storage x = data1; //x is a reference data1.m_value == 2 as well as x.m_value = 2
 				data2 = data1; // should copy data. data2.m_value == 2
 
 				ret_local = x.m_value; // = 2
@@ -6406,7 +6406,7 @@ BOOST_AUTO_TEST_CASE(struct_delete_member)
 			}
 			function deleteMember() public returns (uint ret_value)
 			{
-				testStruct x = data1; //should not copy the data. data1.m_value == 2 but x.m_value = 0
+				testStruct storage x = data1; //should not copy the data. data1.m_value == 2 but x.m_value = 0
 				x.m_value = 4;
 				delete x.m_value;
 				ret_value = data1.m_value;
@@ -8873,7 +8873,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_storage_access_via_pointer)
 			Data public a;
 			uint public separator2;
 			function f() public returns (bool) {
-				Data x = a;
+				Data storage x = a;
 				uint off;
 				assembly {
 					sstore(x_slot, 7)
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index e6d93b36..6ae9d8f9 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(external_structs)
 			struct X { bytes32 x; Test t; Simple[] s; }
 			function f(ActionChoices, uint, Simple) external {}
 			function g(Test, Nested) external {}
-			function h(function(Nested) external returns (uint)[]) external {}
+			function h(function(Nested memory) external returns (uint)[]) external {}
 			function i(Nested[]) external {}
 		}
 	)";
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE(external_structs_in_libraries)
 			struct X { bytes32 x; Test t; Simple[] s; }
 			function f(ActionChoices, uint, Simple) external {}
 			function g(Test, Nested) external {}
-			function h(function(Nested) external returns (uint)[]) external {}
+			function h(function(Nested memory) external returns (uint)[]) external {}
 			function i(Nested[]) external {}
 		}
 	)";
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index a144068d..764550eb 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -518,8 +518,8 @@ BOOST_AUTO_TEST_CASE(inconsistency)
 
 			// Called with params: containerIndex=0, valueIndex=0
 			function levelIII(uint containerIndex, uint valueIndex) private {
-				Container container = containers[containerIndex];
-				Value value = container.values[valueIndex];
+				Container storage container = containers[containerIndex];
+				Value storage value = container.values[valueIndex];
 				debug = container.valueIndices[value.number];
 			}
 			function levelII() private {
@@ -530,7 +530,7 @@ BOOST_AUTO_TEST_CASE(inconsistency)
 
 			function trigger() public returns (uint) {
 				containers.length++;
-				Container container = containers[0];
+				Container storage container = containers[0];
 
 				container.values.push(Value({
 					badnum: 9000,
diff --git a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol
index bd011f2d..0fbad155 100644
--- a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_reference_type.sol
@@ -4,11 +4,10 @@ contract test {
     function f() public {
       uint[] storage s1 = a;
       uint[] memory s2 = new uint[](42);
-      uint[] s3 = b;
+      uint[] storage s3 = b;
       s1.push(42);
       s2[3] = 12;
       s3.push(42);
     }
 }
 // ----
-// Warning: (147-156): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
index a586dc80..be57144e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
@@ -1,6 +1,5 @@
 contract C {
-    function f() public { string x = "abc"; }
+    function f() public { string storage x = "abc"; }
 }
 // ----
-// Warning: (39-47): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// TypeError: (39-55): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
+// TypeError: (39-63): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol
index f5252180..0ab3c198 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/250_member_access_parser_ambiguity.sol
@@ -3,15 +3,14 @@ contract C {
     struct S { uint a; uint b; uint[20][20][20] c; R d; }
     S data;
     function f() public {
-        C.S x = data;
+        C.S storage x = data;
         C.S memory y;
         C.S[10] memory z;
         C.S[10];
         y.a = 2;
         x.c[1][2][3] = 9;
         x.d.y[2][2] = 3;
+        z;
     }
 }
 // ----
-// Warning: (150-155): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// Warning: (194-210): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/276_invalid_types_in_inline_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/276_invalid_types_in_inline_array.sol
index 6c8aabd5..03d7266a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/276_invalid_types_in_inline_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/276_invalid_types_in_inline_array.sol
@@ -1,8 +1,7 @@
 contract C {
     function f() public {
-        uint[3] x = [45, 'foo', true];
+        uint[3] memory x = [45, 'foo', true];
     }
 }
 // ----
-// Warning: (47-56): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// TypeError: (59-76): Unable to deduce common type for array elements.
+// TypeError: (66-83): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
new file mode 100644
index 00000000..6e401920
--- /dev/null
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
@@ -0,0 +1,13 @@
+contract C {
+    struct S { uint a; }
+    S m_x;
+    uint[] m_y;
+    function f() view public {
+        S x = m_x;
+        uint[] y = m_y;
+        x; y;
+    }
+}
+// ----
+// TypeError: (104-107): Data location must be specified as either "memory" or "storage".
+// TypeError: (123-131): Data location must be specified as either "memory" or "storage".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_warn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_warn.sol
deleted file mode 100644
index aa16a6b4..00000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_warn.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-contract C {
-    struct S { uint a; }
-    S x;
-    function f() view public {
-        S y = x;
-        y;
-    }
-}
-// ----
-// Warning: (86-89): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/472_unspecified_storage_v050.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/472_unspecified_storage_v050.sol
deleted file mode 100644
index 179c9931..00000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/472_unspecified_storage_v050.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma experimental "v0.5.0";
-contract C {
-    struct S { uint a; }
-    S x;
-    function f() view public {
-        S y = x;
-        y;
-    }
-}
-// ----
-// TypeError: (116-119): Data location must be specified as either "memory" or "storage".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
index 9801b831..ee56204a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
@@ -1,8 +1,7 @@
 contract C {
     function f() pure public {
-        string x = "abc";
+        string storage x = "abc";
     }
 }
 // ----
-// Warning: (52-60): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// TypeError: (52-68): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
+// TypeError: (52-76): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
index 2b35ffda..4c1f96e6 100644
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
+++ b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
@@ -1,8 +1,6 @@
 contract c {
-    function f() public { c[10] a = 7; uint8[10 * 2] x; }
+    function f() public { c[10] storage a = 7; uint8[10 * 2] storage x; }
 }
 // ----
-// Warning: (39-46): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// Warning: (52-67): Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
-// TypeError: (39-50): Type int_const 7 is not implicitly convertible to expected type contract c[10] storage pointer.
-// DeclarationError: (52-67): Uninitialized storage pointer. Did you mean '<type> memory x'?
+// TypeError: (39-58): Type int_const 7 is not implicitly convertible to expected type contract c[10] storage pointer.
+// DeclarationError: (60-83): Uninitialized storage pointer.