Merge pull request #7485 from ethereum/develop

Merge develop into develop_060

test/libsolidity/smtCheckerTestsJSON/multi.json

@@ -3,8 +3,8 @@
 	{
 		"smtlib2responses":
 		{
-			"0x047d0c67d7e03c5ac96ca227d1e19ba63257f4ab19cef30029413219ec8963af": "sat\n((|EVALEXPR_0| 0))\n",
-			"0xada7569fb01a9b3e2823517ed40dcc99b11fb1e433e6e3ec8a8713f6f95753d3": "sat\n((|EVALEXPR_0| 1))\n"
+			"0x82fb8ee094f0f56b7a63a74177b54a1710d6fc531d426f288c18f36b76cf6a8b": "sat\n((|EVALEXPR_0| 1))\n",
+			"0xb524e7c577188e2e36f0e67fead51269fa0f8b8fb41bff2d973dcf584d38cd1e": "sat\n((|EVALEXPR_0| 0))\n"
 		}
 	}
 }

test/libsolidity/smtCheckerTestsJSON/simple.json

@@ -3,7 +3,7 @@
 	{
 		"smtlib2responses":
 		{
-			"0x2e32517a1410b1a16decd448bb9bac7789d7cf1c6f98703ed6bacfcad6abebfb": "sat\n((|EVALEXPR_0| 0))\n"
+			"0x45c37a9829e623d7838d82b547d297cd446d6b5faff36c53a56862fcee50fb41": "sat\n((|EVALEXPR_0| 0))\n"
 		}
 	}
 }

test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol

@@ -2,4 +2,4 @@ contract C {
     function f() internal pure returns (mapping(uint=>uint) storage r) { }
 }
 // ----
-// TypeError: (53-82): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (53-82): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol

@@ -2,4 +2,4 @@ contract C {
     function f() internal pure returns (mapping(uint=>uint) storage) {}
 }
 // ----
-// TypeError: (53-80): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (53-80): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (87-96): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (87-96): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol

@@ -45,12 +45,12 @@ contract C {
     }
 }
 // ----
-// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
 // Warning: (146-151): Unreachable code.
 // Warning: (169-174): Unreachable code.
-// TypeError: (223-234): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (223-234): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
 // Warning: (316-321): Unreachable code.
-// TypeError: (440-451): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (654-665): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (871-882): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (440-451): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (654-665): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (871-882): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
 // Warning: (933-938): Unreachable code.

test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol

@@ -12,5 +12,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (182-193): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (182-193): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol

@@ -14,5 +14,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (96-107): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (186-197): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (186-197): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol

@@ -18,5 +18,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (249-258): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (367-376): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (249-258): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (367-376): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol

@@ -13,6 +13,6 @@ contract C {
     }
 }
 // ----
-// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (176-187): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (264-275): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (176-187): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (264-275): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol

@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError: (96-107): This variable is of storage pointer type and can be returned without prior assignment.
-// TypeError: (200-211): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError: (200-211): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol

@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment.
+// TypeError: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol

@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (92-116): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (92-116): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol

@@ -5,4 +5,4 @@ contract C {
     function f() m1(b) m2(b = s) internal view returns (uint[] storage b) {}
 }
 // ----
-// TypeError: (129-130): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (129-130): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol

@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (120-121): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol

@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (120-121): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol

@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (94-95): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (94-95): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol

@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError: (109-110): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (109-110): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.

test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol

@@ -8,9 +8,9 @@ library L {
     function i(uint[] calldata, uint[] storage) external pure returns (S storage x) {return x; }
 }
 // ----
-// TypeError: (197-198): This variable is of storage pointer type and can be accessed without prior assignment.
-// TypeError: (203-204): This variable is of storage pointer type and can be accessed without prior assignment.
-// TypeError: (359-360): This variable is of storage pointer type and can be accessed without prior assignment.
-// TypeError: (365-366): This variable is of storage pointer type and can be accessed without prior assignment.
-// TypeError: (460-461): This variable is of storage pointer type and can be accessed without prior assignment.
-// TypeError: (557-558): This variable is of storage pointer type and can be accessed without prior assignment.
+// TypeError: (197-198): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (203-204): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (359-360): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (365-366): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (460-461): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (557-558): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.