Revert explicit evm version error message for try-catch tests in evm <

byzantium

libsolidity/analysis/TypeChecker.cpp

@@ -1159,7 +1159,9 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
 					m_errorReporter.typeError(
 						9908_error,
 						clause.location(),
-						"This catch clause type cannot be used on the selected EVM version. You need at least a Byzantium-compatible EVM or use `catch { ... }`."
+						"This catch clause type cannot be used on the selected EVM version (" +
+						m_evmVersion.name() +
+						"). You need at least a Byzantium-compatible EVM or use `catch { ... }`."
 					);
 			}
 		}
@@ -1169,7 +1171,9 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
 				m_errorReporter.typeError(
 					1812_error,
 					clause.location(),
-					"This catch clause type cannot be used on the selected EVM version. You need at least a Byzantium-compatible EVM or use `catch { ... }`."
+					"This catch clause type cannot be used on the selected EVM version (" +
+					m_evmVersion.name() +
+					"). You need at least a Byzantium-compatible EVM or use `catch { ... }`."
 				);
 
 			if (clause.errorName() == "Error")

test/libsolidity/syntaxTests/tryCatch/low_level_pre-byzantium.sol → test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol

@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <byzantium
+// EVMVersion: =homestead
 // ----
-// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version. You need at least a Byzantium-compatible EVM or use `catch { ... }`.
+// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.

test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch (bytes memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =spuriousDragon
+// ----
+// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.

test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch (bytes memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =tangerineWhistle
+// ----
+// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.

test/libsolidity/syntaxTests/tryCatch/structured_pre_byzantium.sol → test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol

@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <byzantium
+// EVMVersion: =homestead
 // ----
-// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version. You need at least a Byzantium-compatible EVM or use `catch { ... }`.
+// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.

test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch Error(string memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =spuriousDragon
+// ----
+// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.

test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol

@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch Error(string memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =tangerineWhistle
+// ----
+// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.