Merge pull request #10971 from ethereum/onlyWarnAboutVariables

Only warn about variables being shadowed in inline assembly.

test/libsolidity/SolidityNameAndTypeResolution.cpp

@@ -379,58 +379,6 @@ BOOST_AUTO_TEST_CASE(warn_nonpresent_pragma)
 	BOOST_CHECK(searchErrorMessage(*sourceAndError.second.front(), "Source file does not specify required compiler version!"));
 }
 
-BOOST_AUTO_TEST_CASE(returndatasize_as_variable)
-{
-	char const* text = R"(
-		contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
-	)";
-	vector<pair<Error::Type, std::string>> expectations(vector<pair<Error::Type, std::string>>{
-		{Error::Type::Warning, "Variable is shadowed in inline assembly by an instruction of the same name"}
-	});
-	if (!solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
-	{
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("\"returndatasize\" instruction is only available for Byzantium-compatible VMs")));
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("Expected expression to evaluate to one value, but got 0 values instead.")));
-	}
-	CHECK_ALLOW_MULTI(text, expectations);
-}
-
-BOOST_AUTO_TEST_CASE(create2_as_variable)
-{
-	char const* text = R"(
-		contract c { function f() public { uint create2; create2; assembly { pop(create2(0, 0, 0, 0)) } }}
-	)";
-	// This needs special treatment, because the message mentions the EVM version,
-	// so cannot be run via isoltest.
-	vector<pair<Error::Type, std::string>> expectations(vector<pair<Error::Type, std::string>>{
-		{Error::Type::Warning, "Variable is shadowed in inline assembly by an instruction of the same name"}
-	});
-	if (!solidity::test::CommonOptions::get().evmVersion().hasCreate2())
-	{
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("\"create2\" instruction is only available for Constantinople-compatible VMs")));
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("Expected expression to evaluate to one value, but got 0 values instead.")));
-	}
-	CHECK_ALLOW_MULTI(text, expectations);
-}
-
-BOOST_AUTO_TEST_CASE(extcodehash_as_variable)
-{
-	char const* text = R"(
-		contract c { function f() public view { uint extcodehash; extcodehash; assembly { pop(extcodehash(0)) } }}
-	)";
-	// This needs special treatment, because the message mentions the EVM version,
-	// so cannot be run via isoltest.
-	vector<pair<Error::Type, std::string>> expectations(vector<pair<Error::Type, std::string>>{
-		{Error::Type::Warning, "Variable is shadowed in inline assembly by an instruction of the same name"}
-	});
-	if (!solidity::test::CommonOptions::get().evmVersion().hasExtCodeHash())
-	{
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("\"extcodehash\" instruction is only available for Constantinople-compatible VMs")));
-		expectations.emplace_back(make_pair(Error::Type::TypeError, std::string("Expected expression to evaluate to one value, but got 0 values instead.")));
-	}
-	CHECK_ALLOW_MULTI(text, expectations);
-}
-
 BOOST_AUTO_TEST_CASE(getter_is_memory_type)
 {
 	char const* text = R"(

test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol

@@ -0,0 +1,13 @@
+contract C {
+    function add(uint, uint) public pure returns (uint) { return 7; }
+    function g() public pure returns (uint x, uint y) {
+        x = add(1, 2);
+        assembly {
+            y := add(1, 2)
+        }
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// g() -> 7, 3

test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_post_istanbul.sol

@@ -0,0 +1,9 @@
+contract c {
+	function f() public {
+		uint create2; create2;
+		assembly { pop(create2(0, 0, 0, 0)) }
+	}
+}
+// ====
+// EVMVersion: >=constantinople
+// ----

test/libsolidity/syntaxTests/inlineAssembly/create2_as_variable_pre_istanbul.sol

@@ -0,0 +1,11 @@
+contract c {
+	function f() public {
+		uint create2; create2;
+		assembly { pop(create2(0, 0, 0, 0)) }
+	}
+}
+// ====
+// EVMVersion: =byzantium
+// ----
+// TypeError 6166: (78-85): The "create2" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
+// TypeError 3950: (78-97): Expected expression to evaluate to one value, but got 0 values instead.

test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_post_constantinople.sol

@@ -0,0 +1,9 @@
+contract c {
+	function f() public view {
+		uint extcodehash;
+		extcodehash;
+		assembly { pop(extcodehash(0)) }
+	}
+}
+// ====
+// EVMVersion: >=constantinople

test/libsolidity/syntaxTests/inlineAssembly/extcodehash_as_variable_pre_constantinople.sol

@@ -0,0 +1,12 @@
+contract c {
+	function f() public view {
+		uint extcodehash;
+		extcodehash;
+		assembly { pop(extcodehash(0)) }
+	}
+}
+// ====
+// EVMVersion: =byzantium
+// ----
+// TypeError 7110: (93-104): The "extcodehash" instruction is only available for Constantinople-compatible VMs (you are currently compiling for "byzantium").
+// TypeError 3950: (93-107): Expected expression to evaluate to one value, but got 0 values instead.

test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol

@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        uint returndatasize;
+        returndatasize;
+        assembly {
+            let x := returndatasize()
+        }
+    }
+}
+// ====
+// EVMVersion: >=byzantium

test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        uint returndatasize;
+        returndatasize;
+        assembly {
+            returndatasize := 2
+        }
+    }
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// ParserError 6272: (143-145): Cannot assign to builtin function "returndatasize".

test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol

@@ -0,0 +1,6 @@
+contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
+// ====
+// EVMVersion: =homestead
+// ----
+// TypeError 4778: (92-106): The "returndatasize" instruction is only available for Byzantium-compatible VMs (you are currently compiling for "homestead").
+// TypeError 3950: (92-108): Expected expression to evaluate to one value, but got 0 values instead.

test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        uint returndatasize;
+        returndatasize;
+        assembly {
+            let x := returndatasize
+        }
+    }
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// ParserError 7104: (137-151): Builtin function "returndatasize" must be called.

test/libsolidity/syntaxTests/inlineAssembly/shadowing/global_function_by_opcode.sol

@@ -0,0 +1,8 @@
+function mload() pure {}
+contract C {
+    function g() public pure {
+        assembly {
+        }
+    }
+}
+// ----

test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_function_by_opcode.sol

@@ -0,0 +1,9 @@
+contract C {
+    function add(uint, uint) public pure returns (uint) { return 7; }
+    function g() public pure returns (uint x, uint y) {
+        x = add(1, 2);
+        assembly {
+            y := add(1, 2)
+        }
+    }
+}

test/libsolidity/syntaxTests/inlineAssembly/shadowing/state_variable_by_opcode.sol

@@ -0,0 +1,8 @@
+contract C {
+    uint mload;
+    function g() public pure {
+        assembly {
+        }
+    }
+}
+// ----

test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol

@@ -9,6 +9,5 @@ contract C {
     }
 }
 // ----
-// Warning 8261: (109-119): Variable is shadowed in inline assembly by an instruction of the same name
 // Warning 2072: (52-62): Unused local variable.
 // Warning 2072: (109-119): Unused local variable.