Use only a single stack slot for storage references.

1 files changed, 2 insertions, 12 deletions

diff --git a/Types.cpp b/Types.cpp
index 3ea9caa7..0ecb01d2 100644
--- a/Types.cpp
+++ b/Types.cpp
@@ -823,11 +823,9 @@ unsigned ArrayType::getSizeOnStack() const
 	if (m_location == DataLocation::CallData)
 		// offset [length] (stack top)
 		return 1 + (isDynamicallySized() ? 1 : 0);
-	else if (m_location == DataLocation::Storage)
-		// storage_key storage_offset
-		return 2;
 	else
-		// offset
+		// storage slot or memory offset
+		// byte offset inside storage value is omitted
 		return 1;
 }
 
@@ -1035,14 +1033,6 @@ bool StructType::canLiveOutsideStorage() const
 	return true;
 }
 
-unsigned StructType::getSizeOnStack() const
-{
-	if (location() == DataLocation::Storage)
-		return 2; // slot and offset
-	else
-		return 1;
-}
-
 string StructType::toString(bool _short) const
 {
 	string ret = "struct " + m_struct.getName();