Merge pull request #14239 from ethereum/restrict-experimental-mode-to-constantinople

Restrict experimental solidity to constantinople and above

libsolidity/parsing/Parser.cpp

@@ -248,6 +248,8 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedPar
 
 	if (literals.size() >= 2 && literals[0] == "experimental" && literals[1] == "solidity")
 	{
+		if (m_evmVersion < EVMVersion::constantinople())
+			fatalParserError(7637_error, "Experimental solidity requires Constantinople EVM version at the minimum.");
 		if (_finishedParsingTopLevelPragmas)
 			fatalParserError(8185_error, "Experimental pragma \"solidity\" can only be set at the beginning of the source unit.");
 		m_experimentalSolidityEnabledInCurrentSourceUnit = true;

scripts/test_antlr_grammar.sh

@@ -110,7 +110,7 @@ do
   SOL_FILES+=("$line")
 done < <(
   grep --include "*.sol" -riL -E \
-    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185)|^==== Source:" \
+    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185|7637)|^==== Source:" \
     "${ROOT_DIR}/test/libsolidity/syntaxTests" \
     "${ROOT_DIR}/test/libsolidity/semanticTests" |
       # Skipping the unicode tests as I couldn't adapt the lexical grammar to recursively counting RLO/LRO/PDF's.

test/libsolidity/ASTJSON/pragma_experimental_solidity.json

@@ -17,5 +17,5 @@
       "src": "0:29:1"
     }
   ],
-  "src": "0:30:1"
+  "src": "0:70:1"
 }

test/libsolidity/ASTJSON/pragma_experimental_solidity.sol

@@ -1,3 +1,4 @@
 pragma experimental solidity;
-
+// ====
+// EVMVersion: >=constantinople
 // ----

test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json

@@ -16,5 +16,5 @@
       "src": "0:29:1"
     }
   ],
-  "src": "0:30:1"
+  "src": "0:70:1"
 }

test/libsolidity/ASTJSONTest.cpp

@@ -181,7 +181,8 @@ void ASTJSONTest::validateTestConfiguration() const
 	}
 }
 
-ASTJSONTest::ASTJSONTest(string const& _filename)
+ASTJSONTest::ASTJSONTest(string const& _filename):
+	EVMVersionRestrictedTestCase(_filename)
 {
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));

test/libsolidity/ASTJSONTest.h

@@ -35,7 +35,7 @@ class CompilerStack;
 namespace solidity::frontend::test
 {
 
-class ASTJSONTest: public TestCase
+class ASTJSONTest: public EVMVersionRestrictedTestCase
 {
 public:
 	struct TestVariant

test/libsolidity/syntaxTests/pragma/experimental_solidity.sol

@@ -1,3 +1,5 @@
 pragma experimental solidity;
+// ====
+// EVMVersion: >=constantinople
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol

@@ -18,6 +18,8 @@ import "A.sol";
 contract D {
     A a;
 }
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 2141: (B.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
 // ParserError 2141: (C.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.

test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol

@@ -1,5 +1,7 @@
 contract A {}
 
 pragma experimental solidity;
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 8185: (45-45): Experimental pragma "solidity" can only be set at the beginning of the source unit.

test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol

@@ -9,5 +9,7 @@ struct A
 {
     uint256 x;
 }
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 8185: (83-89): Experimental pragma "solidity" can only be set at the beginning of the source unit.

test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol

@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+contract C {}
+
+// ====
+// EVMVersion: <constantinople
+// ----
+// ParserError 7637: (31-39): Experimental solidity requires Constantinople EVM version at the minimum.