Add userDefinedFunctionType helper function

libsolidity/analysis/TypeChecker.cpp

@@ -1740,14 +1740,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	if (userDefinedOperatorResult)
 		_operation.annotation().userDefinedFunction = userDefinedOperatorResult;
 
-	FunctionType const* userDefinedFunctionType = nullptr;
+	FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
-	if (userDefinedOperatorResult)
-		userDefinedFunctionType = &dynamic_cast<FunctionType const&>(
-			userDefinedOperatorResult.get()->libraryFunction() ?
-			*userDefinedOperatorResult.get()->typeViaContractName() :
-			*userDefinedOperatorResult.get()->type()
-		);
-
 	TypeResult builtinResult = subExprType->unaryOperatorResult(op);
 
 	solAssert(!builtinResult || !userDefinedOperatorResult);
@@ -1790,20 +1783,14 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 	_operation.annotation().isConstant = false;
 
 	// Check if the operator is built-in or user-defined.
-	Result<FunctionDefinition const*> userDefinedOperatorResult = leftType->operatorDefinition(
+	Result<FunctionDefinition const*> operatorDefinitionResult = leftType->operatorDefinition(
 		_operation.getOperator(),
 		*currentDefinitionScope(),
 		false // _unaryOperation
 	);
-	if (userDefinedOperatorResult)
+	if (operatorDefinitionResult)
-		_operation.annotation().userDefinedFunction = userDefinedOperatorResult;
+		_operation.annotation().userDefinedFunction = operatorDefinitionResult;
-	FunctionType const* userDefinedFunctionType = nullptr;
+	FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
-	if (userDefinedOperatorResult)
-		userDefinedFunctionType = &dynamic_cast<FunctionType const&>(
-			userDefinedOperatorResult.get()->libraryFunction() ?
-			*userDefinedOperatorResult.get()->typeViaContractName() :
-			*userDefinedOperatorResult.get()->type()
-		);
 	_operation.annotation().isPure =
 		*_operation.leftExpression().annotation().isPure &&
 		*_operation.rightExpression().annotation().isPure &&
@@ -1812,12 +1799,12 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 	TypeResult builtinResult = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
 
 	// Either the operator is user-defined or built-in.
-	solAssert(!userDefinedOperatorResult || !builtinResult);
+	solAssert(!operatorDefinitionResult || !builtinResult);
 
 	Type const* commonType = leftType;
 	if (builtinResult)
 		commonType = builtinResult.get();
-	else if (userDefinedOperatorResult)
+	else if (operatorDefinitionResult)
 	{
 		Type const* normalizedParameterType = userDefinedFunctionType->parameterTypes().at(0);
 		Type const* normalizedLeftType = leftType;
@@ -1860,7 +1847,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 			" and " +
 			rightType->humanReadableName() + "." +
 			(!builtinResult.message().empty() ? " " + builtinResult.message() : "") +
-			(!userDefinedOperatorResult.message().empty() ? " " + userDefinedOperatorResult.message() : "")
+			(!operatorDefinitionResult.message().empty() ? " " + operatorDefinitionResult.message() : "")
 		);
 
 	_operation.annotation().commonType = commonType;

libsolidity/ast/AST.cpp

@@ -907,6 +907,34 @@ OperationAnnotation& UnaryOperation::annotation() const
 	return initAnnotation<OperationAnnotation>();
 }
 
+FunctionType const* UnaryOperation::userDefinedFunctionType() const
+{
+	if (!annotation().userDefinedFunction.set())
+		return nullptr;
+
+	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
+	solAssert(userDefinedFunction);
+	return dynamic_cast<FunctionType const*>(
+		userDefinedFunction->libraryFunction() ?
+		userDefinedFunction->typeViaContractName() :
+		userDefinedFunction->type()
+	);
+}
+
+FunctionType const* BinaryOperation::userDefinedFunctionType() const
+{
+	if (!annotation().userDefinedFunction.set())
+		return nullptr;
+
+	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
+	solAssert(userDefinedFunction);
+	return dynamic_cast<FunctionType const*>(
+		userDefinedFunction->libraryFunction() ?
+		userDefinedFunction->typeViaContractName() :
+		userDefinedFunction->type()
+	);
+}
+
 BinaryOperationAnnotation& BinaryOperation::annotation() const
 {
 	return initAnnotation<BinaryOperationAnnotation>();

libsolidity/ast/AST.h

@@ -2068,6 +2068,8 @@ public:
 	bool isPrefixOperation() const { return m_isPrefix; }
 	Expression const& subExpression() const { return *m_subExpression; }
 
+	FunctionType const* userDefinedFunctionType() const;
+
 	OperationAnnotation& annotation() const override;
 
 private:
@@ -2101,6 +2103,8 @@ public:
 	Expression const& rightExpression() const { return *m_right; }
 	Token getOperator() const { return m_operator; }
 
+	FunctionType const* userDefinedFunctionType() const;
+
 	BinaryOperationAnnotation& annotation() const override;
 
 private:

libsolidity/codegen/ExpressionCompiler.cpp

@@ -420,9 +420,7 @@ bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
 			"Only file-level functions and library functions can be bound to a user type operator."
 		);
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
+		FunctionType const* functionType = _unaryOperation.userDefinedFunctionType();
-			function->libraryFunction() ? function->typeViaContractName() : function->type()
-		);
 		solAssert(functionType);
 
 		functionType = dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
@@ -548,9 +546,7 @@ bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
 			function->isFree() || function->libraryFunction(),
 			"Only file-level functions and library functions can be bound to a user type operator."
 		);
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
+		FunctionType const* functionType = _binaryOperation.userDefinedFunctionType();
-			function->libraryFunction() ? function->typeViaContractName() : function->type()
-		);
 		solAssert(functionType);
 		functionType = dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
 		solAssert(functionType);

libsolidity/codegen/ir/IRGeneratorForStatements.cpp

@@ -685,9 +685,7 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 			"Only file-level functions and library functions can be bound to a user type operator."
 		);
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
+		FunctionType const* functionType = _unaryOperation.userDefinedFunctionType();
-			function->libraryFunction() ? function->typeViaContractName() : function->type()
-		);
 		solAssert(functionType);
 		functionType = dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
 		solAssert(functionType);
@@ -832,9 +830,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 			"Only file-level functions and library functions can be bound to a user type operator."
 		);
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
+		FunctionType const* functionType = _binOp.userDefinedFunctionType();
-			function->libraryFunction() ? function->typeViaContractName() : function->type()
-		);
 		solAssert(functionType);
 		functionType = dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
 		solAssert(functionType);