Merge pull request #4352 from D-Nice/develop

chriseth · web-flow · commit d469df45d8bb · 2018-06-29T12:27:29.000+02:00
Fixes storage ref var typo error from 'prefix' to 'suffix'
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -929,7 +929,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 			}
 			else if (var->type()->dataStoredIn(DataLocation::Storage))
 			{
-				m_errorReporter.typeError(_identifier.location, "You have to use the _slot or _offset prefix to access storage reference variables.");
+				m_errorReporter.typeError(_identifier.location, "You have to use the _slot or _offset suffix to access storage reference variables.");
 				return size_t(-1);
 			}
 			else if (var->type()->sizeOnStack() != 1)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
@@ -0,0 +1,11 @@
+contract C {
+    uint[] x;
+    function() public { 
+        uint[] storage y = x;
+        assembly {
+            pop(y)
+        }
+    }
+}
+// ----
+// TypeError: (117-118): You have to use the _slot or _offset suffix to access storage reference variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_fine.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_fine.sol
@@ -0,0 +1,11 @@
+contract C {
+    uint[] x;
+    function() public { 
+        uint[] storage y = x;
+        assembly {
+            pop(y_slot)
+            pop(y_offset)
+        }
+    }
+}
+// ----

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)`
`929`	`929`	`}`
`930`	`930`	`else if (var->type()->dataStoredIn(DataLocation::Storage))`
`931`	`931`	`{`
`932`		`- m_errorReporter.typeError(_identifier.location, "You have to use the _slot or _offset prefix to access storage reference variables.");`
	`932`	`+ m_errorReporter.typeError(_identifier.location, "You have to use the _slot or _offset suffix to access storage reference variables.");`
`933`	`933`	`return size_t(-1);`
`934`	`934`	`}`
`935`	`935`	`else if (var->type()->sizeOnStack() != 1)`