From 79387b2adaea7ba869ca9c8ad6c1d514fa5e323d Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Thu, 2 Apr 2020 12:27:38 +0530
Subject: [PATCH] Removed redundant declaration check; changed relevant test
 cases

---
 libsolidity/analysis/TypeChecker.cpp                 | 12 +-----------
 .../syntaxTests/array/uninitialized_storage_var.sol  |  6 ++++--
 .../211_uninitialized_mapping_array_variable.sol     |  2 +-
 .../233_non_initialized_references.sol               |  2 +-
 .../syntaxTests/parsing/arrays_in_expressions.sol    |  1 -
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 1345fbf90..4f4cbe379 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1061,17 +1061,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 		if (!varDecl.annotation().type)
 			m_errorReporter.fatalTypeError(_statement.location(), "Use of the \"var\" keyword is disallowed.");
 
-		if (auto ref = dynamic_cast<ReferenceType const*>(type(varDecl)))
-		{
-			if (ref->dataStoredIn(DataLocation::Storage))
-			{
-				string errorText{"Uninitialized storage pointer."};
-				solAssert(varDecl.referenceLocation() != VariableDeclaration::Location::Unspecified, "Expected a specified location at this point");
-				solAssert(m_scope, "");
-				m_errorReporter.declarationError(varDecl.location(), errorText);
-			}
-		}
-		else if (dynamic_cast<MappingType const*>(type(varDecl)))
+		if (dynamic_cast<MappingType const*>(type(varDecl)))
 			m_errorReporter.typeError(
 				varDecl.location(),
 				"Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable."
diff --git a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol b/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
index f3be90715..4966b4e85 100644
--- a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
+++ b/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
@@ -2,8 +2,10 @@ contract C {
 	function f() public {
 		uint[] storage x;
 		uint[10] storage y;
+		x;
+		y;
 	}
 }
 // ----
-// DeclarationError: (38-54): Uninitialized storage pointer.
-// DeclarationError: (58-76): Uninitialized storage pointer.
+// TypeError: (80-81): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError: (85-86): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
index edae7549d..c43dbad6d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError: (52-85): Uninitialized storage pointer.
+// TypeError: (95-96): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
index a0b6f71e7..68e3b2c44 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError: (84-95): Uninitialized storage pointer.
+// TypeError: (105-106): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
index 4c1f96e6e..9035caa25 100644
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
+++ b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
@@ -3,4 +3,3 @@ contract c {
 }
 // ----
 // 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.