Merge pull request #4904 from liangdzou/type_conversion

type conversion checker for array should be stronger

8 files changed, 84 insertions, 2 deletions

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 13294476..3056561b 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1733,8 +1733,23 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 			DataLocation dataLoc = DataLocation::Memory;
 			if (auto argRefType = dynamic_cast<ReferenceType const*>(argType.get()))
 				dataLoc = argRefType->location();
-			resultType = ReferenceType::copyForLocationIfReference(dataLoc, resultType);
-			if (!argType->isExplicitlyConvertibleTo(*resultType))
+			if (auto type = dynamic_cast<ReferenceType const*>(resultType.get()))
+				resultType = type->copyForLocation(dataLoc, type->isPointer());
+			if (argType->isExplicitlyConvertibleTo(*resultType))
+			{
+				if (auto argArrayType = dynamic_cast<ArrayType const*>(argType.get()))
+				{
+					auto resultArrayType = dynamic_cast<ArrayType const*>(resultType.get());
+					solAssert(!!resultArrayType, "");
+					solAssert(
+						argArrayType->location() != DataLocation::Storage ||
+						((resultArrayType->isPointer() || (argArrayType->isByteArray() && resultArrayType->isByteArray())) &&
+						 resultArrayType->location() == DataLocation::Storage),
+						"Invalid explicit conversion to storage type."
+					);
+				}
+			}
+			else
 			{
 				if (resultType->category() == Type::Category::Contract && argType->category() == Type::Category::Address)
 				{
diff --git a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol
new file mode 100644
index 00000000..78c40e53
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_bytes_array.sol
@@ -0,0 +1,9 @@
+contract C {
+	bytes a;
+	bytes b;
+	function f() public view {
+		bytes storage c = a;
+		bytes memory d = b;
+		d = bytes(c);
+	}
+}
diff --git a/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol
new file mode 100644
index 00000000..f7e96f35
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/allowed_conversion_to_string.sol
@@ -0,0 +1,9 @@
+contract C {
+	string a;
+	string b;
+	function f() public view {
+		string storage c = a;
+		string memory d = b;
+		d = string(c);
+	}
+}
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
new file mode 100644
index 00000000..458adda6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
@@ -0,0 +1,10 @@
+contract C {
+	int[10] x;
+	function f() public view {
+		int[](x);
+		int(x);
+	}
+}
+// ----
+// TypeError: (55-63): Explicit type conversion not allowed from "int256[10] storage ref" to "int256[] storage pointer".
+// TypeError: (67-73): Explicit type conversion not allowed from "int256[10] storage ref" to "int256".
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol
new file mode 100644
index 00000000..31e298d0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_storage_array_ref.sol
@@ -0,0 +1,7 @@
+contract C {
+	int[10] x;
+	int[] y;
+	function f() public {
+		y = x;
+	}
+}
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol
new file mode 100644
index 00000000..3aa59612
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer1.sol
@@ -0,0 +1,10 @@
+contract C {
+	uint[] a;
+	uint[] b;
+	function f() public view {
+		uint[] storage c = a;
+		uint[] storage d = b;
+		d = uint[](c);
+	}
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol
new file mode 100644
index 00000000..060c9707
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_to_int_array_pointer2.sol
@@ -0,0 +1,10 @@
+contract C {
+	uint[] a;
+	uint[] b;
+	function f() public view {
+		uint[] storage c = a;
+		uint[] memory d = b;
+		d = uint[](c);
+	}
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
new file mode 100644
index 00000000..a441b540
--- /dev/null
+++ b/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
@@ -0,0 +1,12 @@
+contract C {
+	int[] x;
+	function f() public {
+		int[] storage a = x;
+		int[] memory b;
+		a = b;
+		a = int[](b);
+	}
+}
+// ----
+// TypeError: (93-94): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
+// TypeError: (102-110): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.