fixup! check for repeat

ethereum · Jan 23, 2020 · 21647d3 · 21647d3
1 parent a9cb83b
commit 21647d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -2237,9 +2237,9 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 		return false;
 	}
 
-	bool setSalt = false; expressionFunctionType->saltSet();
-	bool setValue = false; expressionFunctionType->valueSet();
-	bool setGas = false ;expressionFunctionType->gasSet();
+	bool setSalt = false;
+	bool setValue = false;
+	bool setGas = false;
 
 	FunctionType::Kind kind = expressionFunctionType->kind();
 	if (
@@ -2260,7 +2260,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 
 	auto setCheckOption = [&](bool& _option, string const&& _name, bool _alreadySet = false)
 	{
-		if (_option)
+		if (_option || _alreadySet)
 			m_errorReporter.typeError(
 				_functionCallOptions.location(),
 				_alreadySet ?
@@ -2278,7 +2278,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 		{
 			if (kind == FunctionType::Kind::Creation)
 			{
-				setCheckOption(setSalt, "salt");
+				setCheckOption(setSalt, "salt", expressionFunctionType->saltSet());
 				expectType(*_functionCallOptions.options()[i], *TypeProvider::fixedBytes(32));
 			}
 			else
@@ -2308,7 +2308,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 			{
 				expectType(*_functionCallOptions.options()[i], *TypeProvider::uint256());
 
-				setCheckOption(setValue, "value");
+				setCheckOption(setValue, "value", expressionFunctionType->valueSet());
 			}
 		}
 		else if (name == "gas")
@@ -2322,7 +2322,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 			{
 				expectType(*_functionCallOptions.options()[i], *TypeProvider::uint256());
 
-				setCheckOption(setGas, "gas");
+				setCheckOption(setGas, "gas", expressionFunctionType->gasSet());
 			}
 		}
 		else
@@ -2332,13 +2332,6 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 			);
 	}
 
-	if (expressionFunctionType->gasSet())
-		setCheckOption(setGas, "gas", true);
-	if (expressionFunctionType->valueSet())
-		setCheckOption(setValue, "value", true);
-	if (expressionFunctionType->saltSet())
-		setCheckOption(setSalt, "salt", true);
-
 	if (setSalt && !m_evmVersion.hasCreate2())
 		m_errorReporter.typeError(
 			_functionCallOptions.location(),

diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
@@ -16,6 +16,6 @@ contract C {
 // TypeError: (120-154): Option "gas" has already been set.
 // TypeError: (164-198): Option "value" has already been set.
 // TypeError: (208-242): Option "value" has already been set.
-// TypeError: (252-293): Option "gas" has already been set.
 // TypeError: (252-293): Option "value" has already been set.
+// TypeError: (252-293): Option "gas" has already been set.
 // TypeError: (303-330): Option "salt" has already been set.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions_unsupported.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_calloptions_unsupported.sol
@@ -10,6 +10,6 @@ contract C {
 // ====
 // EVMVersion: <constantinople
 // ----
-// TypeError: (97-123): Unsupported call option "salt" (requires "constantinople" or newer).
-// TypeError: (127-144): Unsupported call option "salt" (requires "constantinople" or newer).
-// TypeError: (168-188): Unsupported call option "salt" (requires "constantinople" or newer).
+// TypeError: (97-123): Unsupported call option "salt" (requires Constantinople-compatible VMs).
+// TypeError: (127-144): Unsupported call option "salt" (requires Constantinople-compatible VMs).
+// TypeError: (168-188): Unsupported call option "salt" (requires Constantinople-compatible VMs).