Merge pull request #3678 from ethereum/develop

Merge develop into release.

1 files changed, 29 insertions, 12 deletions

diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 5a3745b0..ddac194b 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -93,8 +93,10 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 				m_errorReporter.syntaxError(_pragma.location(), "Duplicate experimental feature name.");
 			else
 			{
-				m_sourceUnit->annotation().experimentalFeatures.insert(ExperimentalFeatureNames.at(literal));
-				m_errorReporter.warning(_pragma.location(), "Experimental features are turned on. Do not use experimental features on live deployments.");
+				auto feature = ExperimentalFeatureNames.at(literal);
+				m_sourceUnit->annotation().experimentalFeatures.insert(feature);
+				if (!ExperimentalFeatureOnlyAnalysis.count(feature))
+					m_errorReporter.warning(_pragma.location(), "Experimental features are turned on. Do not use experimental features on live deployments.");
 			}
 		}
 	}
@@ -172,10 +174,18 @@ bool SyntaxChecker::visit(Break const& _breakStatement)
 
 bool SyntaxChecker::visit(Throw const& _throwStatement)
 {
-	m_errorReporter.warning(
-		_throwStatement.location(),
-		"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
-	);
+	bool const v050 = m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeature::V050);
+
+	if (v050)
+		m_errorReporter.syntaxError(
+			_throwStatement.location(),
+			"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
+		);
+	else
+		m_errorReporter.warning(
+			_throwStatement.location(),
+			"\"throw\" is deprecated in favour of \"revert()\", \"require()\" and \"assert()\"."
+		);
 
 	return true;
 }
@@ -202,13 +212,20 @@ bool SyntaxChecker::visit(PlaceholderStatement const&)
 
 bool SyntaxChecker::visit(FunctionDefinition const& _function)
 {
+	bool const v050 = m_sourceUnit->annotation().experimentalFeatures.count(ExperimentalFeature::V050);
+
 	if (_function.noVisibilitySpecified())
-		m_errorReporter.warning(
-			_function.location(),
-			"No visibility specified. Defaulting to \"" +
-			Declaration::visibilityToString(_function.visibility()) +
-			"\"."
-		);
+	{
+		if (v050)
+			m_errorReporter.syntaxError(_function.location(), "No visibility specified.");
+		else
+			m_errorReporter.warning(
+				_function.location(),
+				"No visibility specified. Defaulting to \"" +
+				Declaration::visibilityToString(_function.visibility()) +
+				"\"."
+			);
+	}
 	return true;
 }