Merge pull request #7759 from ethereum/abiEncoderV2NoWarn

Do not warn about enabled ABIEncoderV2 anymore.

Changelog.md

@@ -34,6 +34,7 @@ Language Features:
 
 Compiler Features:
  * Allow revert strings to be stripped from the binary using the ``--revert-strings`` option or the ``settings.debug.revertStrings`` setting.
+ * ABIEncoderV2: Do not warn about enabled ABIEncoderV2 anymore (the pragma is still needed, though).
 
 
 ### 0.5.14 (unreleased)

libsolidity/analysis/SyntaxChecker.cpp

@@ -106,7 +106,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 			{
 				auto feature = ExperimentalFeatureNames.at(literal);
 				m_sourceUnit->annotation().experimentalFeatures.insert(feature);
-				if (!ExperimentalFeatureOnlyAnalysis.count(feature))
+				if (!ExperimentalFeatureWithoutWarning.count(feature))
 					m_errorReporter.warning(_pragma.location(), "Experimental features are turned on. Do not use experimental features on live deployments.");
 			}
 		}

libsolidity/ast/ExperimentalFeatures.h

@@ -21,6 +21,7 @@
 #pragma once
 
 #include <map>
+#include <set>
 
 namespace dev
 {
@@ -35,10 +36,11 @@ enum class ExperimentalFeature
 	TestOnlyAnalysis
 };
 
-static std::map<ExperimentalFeature, bool> const ExperimentalFeatureOnlyAnalysis =
+static std::set<ExperimentalFeature> const ExperimentalFeatureWithoutWarning =
 {
-	{ ExperimentalFeature::SMTChecker, true },
+	ExperimentalFeature::ABIEncoderV2,
-	{ ExperimentalFeature::TestOnlyAnalysis, true },
+	ExperimentalFeature::SMTChecker,
+	ExperimentalFeature::TestOnlyAnalysis,
 };
 
 static std::map<std::string, ExperimentalFeature> const ExperimentalFeatureNames =

libsolidity/interface/CompilerStack.cpp

@@ -982,7 +982,7 @@ namespace
 bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& features)
 {
 	for (auto const feature: features)
-		if (!ExperimentalFeatureOnlyAnalysis.count(feature))
+		if (!ExperimentalFeatureWithoutWarning.count(feature))
 			return false;
 	return true;
 }

test/cmdlineTests/abiencoderv2_no_warning/args

@@ -0,0 +1 @@
+--hashes

test/cmdlineTests/abiencoderv2_no_warning/err

@@ -0,0 +1 @@
+

test/cmdlineTests/abiencoderv2_no_warning/exit

@@ -0,0 +1 @@
+0

test/cmdlineTests/abiencoderv2_no_warning/input.sol

@@ -0,0 +1,7 @@
+pragma solidity >=0.0;
+pragma experimental ABIEncoderV2;
+contract C {
+    struct S { uint x; }
+    function f(S memory) public pure {
+    }
+}

test/cmdlineTests/abiencoderv2_no_warning/output

@@ -0,0 +1,4 @@
+
+======= abiencoderv2_no_warning/input.sol:C =======
+Function signatures:
+3fc03eeb: f((uint256))

test/libsolidity/GasCosts.cpp

@@ -107,16 +107,16 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		{
 			// Costs with 0 are cases which cannot be triggered in tests.
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(0, 127721, evmVersion);
+				CHECK_DEPLOY_GAS(0, 123969, evmVersion);
 			else
 				CHECK_DEPLOY_GAS(0, 113993, evmVersion);
 		}
 		else
 		{
 			if (evmVersion < EVMVersion::istanbul())
-				CHECK_DEPLOY_GAS(151523, 135371, evmVersion);
+				CHECK_DEPLOY_GAS(147771, 131687, evmVersion);
 			else
-				CHECK_DEPLOY_GAS(134883, 120083, evmVersion);
+				CHECK_DEPLOY_GAS(131859, 117231, evmVersion);
 		}
 	}
 	else if (evmVersion < EVMVersion::istanbul())

test/libsolidity/gasTests/abiv2.sol

@@ -14,9 +14,9 @@ contract C {
 }
 // ----
 // creation:
-//   codeDepositCost: 1122800
+//   codeDepositCost: 1120000
-//   executionCost: 1167
+//   executionCost: 1160
-//   totalCost: 1123967
+//   totalCost: 1121160
 // external:
 //   a(): 530
 //   b(uint256): infinite

test/libsolidity/gasTests/abiv2_optimised.sol

@@ -17,9 +17,9 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 608600
+//   codeDepositCost: 605800
-//   executionCost: 645
+//   executionCost: 638
-//   totalCost: 609245
+//   totalCost: 606438
 // external:
 //   a(): 429
 //   b(uint256): 884

test/libsolidity/smtCheckerTests/functions/abi_encode_functions.sol

@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ----
-// Warning: (31-64): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning: (162-165): Assertion checker does not yet implement type abi
 // Warning: (162-176): Assertion checker does not yet implement this type of function call.
 // Warning: (178-181): Assertion checker does not yet implement type abi

test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2.sol

@@ -8,7 +8,6 @@ contract C {
   }
 }
 // ----
-// Warning: (32-67): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning: (151-159): Assertion checker does not yet support the type of this variable.
 // Warning: (188-191): Assertion checker does not yet implement type abi
 // Warning: (207-208): Assertion checker does not yet implement type type(struct C.S storage pointer)

test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol

@@ -10,7 +10,6 @@ contract C {
   }
 }
 // ----
-// Warning: (32-67): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning: (125-132): Unused local variable.
 // Warning: (183-190): Unused local variable.
 // Warning: (136-139): Assertion checker does not yet implement type abi

test/libsolidity/syntaxTests/array/calldata.sol

@@ -3,4 +3,3 @@ contract Test {
     function f(uint[3] calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/array/calldata_assign.sol

@@ -3,5 +3,4 @@ contract Test {
     function f(uint256[] calldata s) external { s[0] = 4; }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (98-102): Calldata arrays are read-only.

test/libsolidity/syntaxTests/array/calldata_dynamic.sol

@@ -3,4 +3,3 @@ contract Test {
     function f(uint[] calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/array/calldata_multi.sol

@@ -3,4 +3,3 @@ contract Test {
     function f(uint[3][4] calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/array/calldata_multi_dynamic.sol

@@ -3,4 +3,3 @@ contract Test {
     function f(uint[][] calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/array/length/not_too_large.sol

@@ -7,4 +7,3 @@ contract C {
     }
 }
 // ----
-// Warning: (52-85): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol

@@ -5,6 +5,5 @@ contract C {
   function f(uint[2**30][2**30][][] memory) public pure {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (61-101): Array is too large to be encoded.
 // TypeError: (131-160): Array is too large to be encoded.

test/libsolidity/syntaxTests/events/event_array_indexed_v2.sol

@@ -3,4 +3,3 @@ contract c {
     event E(uint[] indexed);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/events/event_array_v2.sol

@@ -3,4 +3,3 @@ contract c {
     event E(uint[]);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/events/event_nested_array_indexed_v2.sol

@@ -3,4 +3,3 @@ contract c {
     event E(uint[][] indexed);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/events/event_nested_array_v2.sol

@@ -3,4 +3,3 @@ contract c {
     event E(uint[][]);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/events/event_struct_indexed_v2.sol

@@ -4,4 +4,3 @@ contract c {
     event E(S indexed);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/events/event_struct_v2.sol

@@ -4,4 +4,3 @@ contract c {
     event E(S);
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_match.sol

@@ -18,6 +18,3 @@ pragma experimental ABIEncoderV2;
 import "./B.sol";
 contract C is B { }
 // ----
-// Warning: (A.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning: (B.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning: (C.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol

@@ -16,6 +16,4 @@ contract B is A { }
 import "./B.sol";
 contract C is B { }
 // ----
-// Warning: (A.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.
-// Warning: (B.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (C.sol:18-37): Contract "C" does not use the new experimental ABI encoder but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature.

test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol

@@ -14,5 +14,4 @@ contract B is A { }
 import "./B.sol";
 contract C is B { }
 // ----
-// Warning: (A.sol:0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (B.sol:18-37): Contract "B" does not use the new experimental ABI encoder but wants to inherit from a contract which uses types that require it. Use "pragma experimental ABIEncoderV2;" for the inheriting contract as well to enable the feature.

test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_struct.sol

@@ -14,4 +14,3 @@ contract C is I {
     function i(S memory) public override payable {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/inheritance/override/calldata_memory_struct.sol

@@ -14,4 +14,3 @@ contract B is A {
     function i(S memory) public override payable {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol

@@ -6,5 +6,4 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (128-131): Calldata structs are read-only.

test/libsolidity/syntaxTests/nameAndTypeResolution/039_functions_with_identical_structs_in_interface.sol

@@ -7,5 +7,4 @@ contract C {
     function f(S2 memory) public pure {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (143-179): Function overload clash during conversion to external types for arguments.

test/libsolidity/syntaxTests/nameAndTypeResolution/040_functions_with_different_structs_in_interface.sol

@@ -7,4 +7,3 @@ contract C {
     function f(S2 memory) public pure {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/nameAndTypeResolution/041_functions_with_stucts_of_non_external_types_in_interface.sol

@@ -5,5 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (103-111): Internal type is not allowed for public or external functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/042_functions_with_stucts_of_non_external_types_in_interface_2.sol

@@ -5,5 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (105-113): Only libraries are allowed to use the mapping type in public or external functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/043_functions_with_stucts_of_non_external_types_in_interface_nested.sol

@@ -6,5 +6,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (132-140): Only libraries are allowed to use the mapping type in public or external functions.

test/libsolidity/syntaxTests/nameAndTypeResolution/044_returning_multi_dimensional_arrays_new_abi.sol

@@ -4,4 +4,3 @@ contract C {
     function f() public pure returns (string[][] memory) {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/nameAndTypeResolution/047_returning_arrays_in_structs_new_abi.sol

@@ -5,4 +5,3 @@ contract C {
     function f() public pure returns (S memory) {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/nameAndTypeResolution/260_library_memory_struct.sol

@@ -4,4 +4,3 @@ library c {
     function f() public returns (S memory) {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/nameAndTypeResolution/403_return_structs.sol

@@ -6,4 +6,3 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/nameAndTypeResolution/404_read_returned_struct.sol

@@ -9,4 +9,3 @@ contract A {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/parsing/array_range_nested.sol

@@ -9,4 +9,3 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol

@@ -11,6 +11,5 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (191-192): Type not supported in packed mode.
 // TypeError: (194-195): Type not supported in packed mode.

test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol

@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (193-195): Type not supported in packed mode.
 // TypeError: (323-324): Type not supported in packed mode.
 // TypeError: (326-327): Type not supported in packed mode.

test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory_v2.sol

@@ -7,4 +7,3 @@ contract C {
   }
 }
 // ----
-// Warning: (0-35): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/specialFunctions/encode_array_of_struct.sol

@@ -7,4 +7,3 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/array_calldata.sol

@@ -5,4 +5,3 @@ contract Test {
     function f(S[][] calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/calldata.sol

@@ -4,4 +4,3 @@ contract Test {
     function f(S calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/calldata_array_assign.sol

@@ -6,5 +6,4 @@ contract Test {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (144-147): Calldata structs are read-only.

test/libsolidity/syntaxTests/structs/calldata_assign.sol

@@ -4,5 +4,4 @@ contract Test {
     function f(S calldata s) external { s.a = 4; }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (114-117): Calldata structs are read-only.

test/libsolidity/syntaxTests/structs/calldata_dynamic.sol

@@ -4,4 +4,3 @@ contract Test {
 	function f(S calldata) external { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/calldata_struct_function_type.sol

@@ -6,4 +6,3 @@ contract C {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/memory_to_calldata.sol

@@ -5,7 +5,6 @@ contract Test {
     function g(S calldata s) external { S memory m; s = m; }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (114-115): External function arguments of reference type are read-only.
 // TypeError: (118-122): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
 // TypeError: (178-179): External function arguments of reference type are read-only.

test/libsolidity/syntaxTests/structs/recursion/multi_struct_composition.sol

@@ -12,4 +12,3 @@ contract C {
   function f(T memory) public pure { }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/recursion/parallel_structs.sol

@@ -12,4 +12,3 @@ contract TestContract
     function addTestStruct(TestStruct memory) public pure {}
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol

@@ -10,5 +10,4 @@ library Test {
     }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (146-168): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.

test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol

@@ -7,5 +7,4 @@ contract Data {
     struct S { S x; }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (63-78): Recursive type not allowed for public or external contract functions.

test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol

@@ -5,5 +5,4 @@ contract C {
    }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (126-129): Fractional numbers cannot yet be encoded.

test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol

@@ -5,6 +5,5 @@ contract C {
    }
 }
 // ----
-// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
 // TypeError: (132-135): Fractional numbers cannot yet be encoded.
 // TypeError: (137-138): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.