Merge pull request #15768 from ethereum/adjust-semantic-tests-to-work…

…-on-eof-too

Adjust semantic tests to work on both EOF and legacy

test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol

@@ -7,8 +7,8 @@ contract C {
         x[2] = y[2] = uint120(type(uint).max - 3);
         hash1 = keccak256(abi.encodePacked(x));
         hash2 = keccak256(abi.encodePacked(y));
-        hash3 = keccak256(abi.encodePacked(this.f));
+        hash3 = keccak256(abi.encodePacked(C(address(0x1234))));
     }
 }
 // ----
-// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0x0e9229fb1d2cd02cee4b6c9f25497777014a8766e3479666d1c619066d2887ec
+// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xe7490fade3a8e31113ecb6c0d2635e28a6f5ca8359a57afe914827f41ddf0848

test/libsolidity/semanticTests/constructor/no_callvalue_check.sol

@@ -9,17 +9,17 @@ contract B3 { constructor() payable {} }
 contract C {
 	function f() public payable returns (bool) {
 		// Make sure none of these revert.
-		new B1{value: 10}();
-		new B2{value: 10}();
-		new B3{value: 10}();
+		new B1{value: 10, salt: hex"00"}();
+		new B2{value: 10, salt: hex"01"}();
+		new B3{value: 10, salt: hex"02"}();
 		return true;
 	}
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 117623
+// gas irOptimized: 117688
 // gas irOptimized code: 1800
-// gas legacy: 117821
+// gas legacy: 117889
 // gas legacy code: 4800
-// gas legacyOptimized: 117690
+// gas legacyOptimized: 117761
 // gas legacyOptimized code: 4800

test/libsolidity/semanticTests/errors/errors_by_parameter_type.sol

@@ -27,10 +27,10 @@ contract C {
         require(false, E3(S(1, true, "string literal")));
     }
     function e() external view {
-        require(false, E4(address(this)));
+        require(false, E4(address(0x1234)));
     }
     function f() external view {
-        require(false, E5(this.a));
+        require(false, E5(C(address(0x1234)).a));
     }
 }
 
@@ -41,5 +41,5 @@ contract C {
 // b() -> FAILURE, hex"47e26897", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // c() -> FAILURE, hex"8f372c34", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
 // d() -> FAILURE, hex"5717173e", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"000000000000000000000000000000000000000000000000000000000000000e", hex"737472696e67206c69746572616c000000000000000000000000000000000000"
-// e() -> FAILURE, hex"7efef9ea", hex"000000000000000000000000c06afe3a8444fc0004668591e8306bfb9968e79e"
-// f() -> FAILURE, hex"0c3f12eb", hex"c06afe3a8444fc0004668591e8306bfb9968e79e0dbe671f0000000000000000"
+// e() -> FAILURE, hex"7efef9ea", hex"0000000000000000000000000000000000000000000000000000000000001234"
+// f() -> FAILURE, hex"0c3f12eb", hex"00000000000000000000000000000000000012340dbe671f0000000000000000"

test/libsolidity/semanticTests/errors/require_error_function_pointer_parameter.sol

@@ -10,9 +10,9 @@ contract C
     function f() external view
     {
         // more than one stack slot
-        require(false, CustomError(this.e));
+        require(false, CustomError(C(address(0x1234)).e));
     }
 }
 
 // ----
-// f() -> FAILURE, hex"271b1dfa", hex"c06afe3a8444fc0004668591e8306bfb9968e79ef37cdc8e0000000000000000"
+// f() -> FAILURE, hex"271b1dfa", hex"0000000000000000000000000000000000001234f37cdc8e0000000000000000"

test/libsolidity/semanticTests/events/event_indexed_function.sol

@@ -1,9 +1,9 @@
 contract C {
     event Test(function() external indexed);
     function f() public {
-        emit Test(this.f);
+        emit Test(C(address(0x1234)).f);
     }
 }
 // ----
 // f() ->
-// ~ emit Test(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79e26121ff00000000000000000
+// ~ emit Test(function): #0x123426121ff00000000000000000

test/libsolidity/semanticTests/events/event_indexed_function2.sol

@@ -2,14 +2,14 @@ contract C {
     event TestA(function() external indexed);
     event TestB(function(uint256) external indexed);
     function f1() public {
-        emit TestA(this.f1);
+        emit TestA(C(address(0x1234)).f1);
     }
     function f2(uint256 a) public {
-        emit TestB(this.f2);
+        emit TestB(C(address(0x1234)).f2);
     }
 }
 // ----
 // f1() ->
-// ~ emit TestA(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ec27fc3050000000000000000
+// ~ emit TestA(function): #0x1234c27fc3050000000000000000
 // f2(uint256): 1 ->
-// ~ emit TestB(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ebf3724af0000000000000000
+// ~ emit TestB(function): #0x1234bf3724af0000000000000000

test/libsolidity/semanticTests/externalContracts/snark.sol

@@ -1,3 +1,5 @@
+pragma abicoder v2;
+
 library Pairing {
 	struct G1Point {
 		uint X;
@@ -35,34 +37,26 @@ library Pairing {
 
 	/// @return r the sum of two points of G1
 	function add(G1Point memory p1, G1Point memory p2) internal returns (G1Point memory r) {
-		uint[4] memory input;
+		uint[6] memory input;
 		input[0] = p1.X;
 		input[1] = p1.Y;
 		input[2] = p2.X;
 		input[3] = p2.Y;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 6, 0, input, 0xc0, r, 0x60)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
-		}
+		(bool success, bytes memory encodedResult) = address(6).call(abi.encode(input));
 		require(success);
+		r = abi.decode(encodedResult, (G1Point));
 	}
 
 	/// @return r the product of a point on G1 and a scalar, i.e.
 	/// p == p.mul(1) and p.add(p) == p.mul(2) for all points p.
 	function mul(G1Point memory p, uint s) internal returns (G1Point memory r) {
-		uint[3] memory input;
+		uint[4] memory input;
 		input[0] = p.X;
 		input[1] = p.Y;
 		input[2] = s;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 7, 0, input, 0x80, r, 0x60)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
-		}
+		(bool success, bytes memory encodedResult) = address(7).call(abi.encode(input));
 		require(success);
+		r = abi.decode(encodedResult, (G1Point));
 	}
 
 	/// @return the result of computing the pairing check
@@ -83,15 +77,19 @@ library Pairing {
 			input[i * 6 + 4] = p2[i].Y[0];
 			input[i * 6 + 5] = p2[i].Y[1];
 		}
-		uint[1] memory out;
-		bool success;
-		assembly {
-			success := call(sub(gas(), 2000), 8, 0, add(input, 0x20), mul(inputSize, 0x20), out, 0x20)
-			// Use "invalid" to make gas estimation work
-			switch success case 0 { invalid() }
+
+		bytes memory encodedInput = new bytes(inputSize * 32);
+		for (uint i = 0; i < inputSize; i++)
+		{
+			uint offset = (i + 1) * 32;
+			uint item = input[i];
+			assembly ("memory-safe") {
+				mstore(add(encodedInput, offset), item)
+			}
 		}
+		(bool success, bytes memory encodedResult) = address(8).call(encodedInput);
 		require(success);
-		return out[0] != 0;
+		return abi.decode(encodedResult, (bool));
 	}
 	function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal returns (bool) {
 		G1Point[] memory p1 = new G1Point[](2);
@@ -294,11 +292,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
-// gas irOptimized: 270409
-// gas legacy: 275219
-// gas legacyOptimized: 266862
+// gas irOptimized: 275319
+// gas legacy: 293854
+// gas legacyOptimized: 276409
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 785720
-// gas legacy: 801903
-// gas legacyOptimized: 770941
+// gas irOptimized: 821446
+// gas legacy: 914211
+// gas legacyOptimized: 820319

test/libsolidity/semanticTests/functionCall/failed_create.sol

@@ -2,35 +2,35 @@ contract D { constructor() payable {} }
 contract C {
 	uint public x;
 	constructor() payable {}
-	function f(uint amount) public returns (D) {
+	function f(uint amount) public {
 		x++;
-		return (new D){value: amount}();
+		(new D){value: amount, salt: bytes32(x)}();
 	}
-	function stack(uint depth) public payable returns (address) {
+	function stack(uint depth) public payable {
 		if (depth > 0)
-			return this.stack(depth - 1);
+			this.stack(depth - 1);
 		else
-			return address(f(0));
+			f(0);
 	}
 }
 // ====
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 61548
-// gas irOptimized code: 104600
-// gas legacy: 70147
-// gas legacy code: 215400
-// gas legacyOptimized: 61715
-// gas legacyOptimized code: 106800
-// f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// gas irOptimized: 59688
+// gas irOptimized code: 81800
+// gas legacy: 64468
+// gas legacy code: 145400
+// gas legacyOptimized: 60443
+// gas legacyOptimized code: 91200
+// f(uint256): 20 ->
 // x() -> 1
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 252410
-// gas legacy: 476845
-// gas legacyOptimized: 299061
+// gas irOptimized: 298110
+// gas legacy: 527207
+// gas legacyOptimized: 353607
 // x() -> 1
-// stack(uint256): 10 -> 0x87948bd7ebbe13a00bfd930c93e4828ab18e3908
+// stack(uint256): 10 ->
 // x() -> 2

test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol

@@ -13,8 +13,6 @@ contract helper {
         return flag;
     }
 }
-
-
 contract test {
     helper h;
 

test/libsolidity/semanticTests/functionTypes/address_member.sol

@@ -1,10 +1,10 @@
 contract C {
     function f() public view returns (address a1, address a2) {
-        a1 = this.f.address;
-        this.f.address;
-        [this.f.address][0];
-        a2 = [this.f.address][0];
+        a1 = C(address(0x1234)).f.address;
+        C(address(0x1234)).f.address;
+        [C(address(0x1234)).f.address][0];
+        a2 = [C(address(0x1234)).f.address][0];
     }
 }
 // ----
-// f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e, 0xc06afe3a8444fc0004668591e8306bfb9968e79e
+// f() -> 0x1234, 0x1234

test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol

@@ -1,17 +1,19 @@
 contract C {
     function() external public x;
-    uint public y = 0;
 
-    function increment() public {
-        ++y;
-    }
+    function f() public {}
 
     function set() external {
-        x = this.increment;
+        x = this.f;
+    }
+
+    function isF() external returns (bool) {
+        return x == this.f;
     }
 
-    function incrementIndirectly() public {
-        x();
+    function isZero() external returns (bool) {
+        function() external zero;
+        return x == zero;
     }
 
     function deleteFunction() public {
@@ -20,18 +22,14 @@ contract C {
     }
 }
 // ----
-// x() -> 0
-// y() -> 0
-// increment() ->
-// y() -> 1
+// isF() -> false
+// isZero() -> true
+// deleteFunction() ->
+// isF() -> false
+// isZero() -> true
 // set() ->
-// x() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79ed09de08a0000000000000000
-// increment() ->
-// y() -> 2
-// incrementIndirectly() ->
-// y() -> 3
+// isF() -> true
+// isZero() -> false
 // deleteFunction() ->
-// increment() ->
-// y() -> 4
-// incrementIndirectly() -> FAILURE
-// y() -> 4
+// isF() -> false
+// isZero() -> true

test/libsolidity/semanticTests/immutable/multi_creation.sol

@@ -18,20 +18,20 @@ contract C {
 	uint public y;
 	constructor() {
 		a = 3;
-		x = (new A()).f();
-		y = (new B()).f();
+		x = (new A{salt: hex"00"}()).f();
+		y = (new B{salt: hex"00"}()).f();
 	}
 	function f() public returns (uint256, uint, uint) {
-		return (a, (new A()).f(), (new B()).f());
+		return (a, (new A{salt: hex"01"}()).f(), (new B{salt: hex"01"}()).f());
 	}
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 86796
+// gas irOptimized: 86892
 // gas irOptimized code: 37200
-// gas legacy: 87727
+// gas legacy: 87839
 // gas legacy code: 60800
-// gas legacyOptimized: 86770
+// gas legacyOptimized: 86870
 // gas legacyOptimized code: 37200
 // x() -> 7
 // y() -> 5