Introduce typeWhenAttached helper

Author: rodiazet

libsolidity/analysis/TypeChecker.cpp

@@ -4052,12 +4052,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 		FunctionDefinition const& functionDefinition =
 			dynamic_cast<FunctionDefinition const&>(*path->annotation().referencedDeclaration);
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
-			functionDefinition.libraryFunction() ?
-				functionDefinition.typeViaContractName(Declaration::ContractNameAccessKind::Library) :
-				functionDefinition.type()
-			);
-
+		FunctionType const* functionType = dynamic_cast<FunctionType const*>(functionDefinition.typeWhenAttached());
 		solAssert(functionType);
 
 		if (functionDefinition.parameters().empty())

libsolidity/ast/AST.cpp

@@ -532,6 +532,12 @@ Type const* FunctionDefinition::typeViaContractName(ContractNameAccessKind _acce
 	}
 }
 
+Type const* FunctionDefinition::typeWhenAttached() const
+{
+	solAssert(isFree() || libraryFunction());
+	return libraryFunction() ? typeViaContractName(ContractNameAccessKind::Library) : type();
+}
+
 std::string FunctionDefinition::externalSignature() const
 {
 	return TypeProvider::function(*this)->externalSignature();
@@ -978,11 +984,7 @@ FunctionType const* UnaryOperation::userDefinedFunctionType() const
 		return nullptr;
 
 	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
-	return dynamic_cast<FunctionType const*>(
-		userDefinedFunction->libraryFunction() ?
-		userDefinedFunction->typeViaContractName(Declaration::ContractNameAccessKind::Library) :
-		userDefinedFunction->type()
-	);
+	return dynamic_cast<FunctionType const*>(userDefinedFunction->typeWhenAttached());
 }
 
 FunctionType const* BinaryOperation::userDefinedFunctionType() const
@@ -991,11 +993,7 @@ FunctionType const* BinaryOperation::userDefinedFunctionType() const
 		return nullptr;
 
 	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
-	return dynamic_cast<FunctionType const*>(
-		userDefinedFunction->libraryFunction() ?
-		userDefinedFunction->typeViaContractName(Declaration::ContractNameAccessKind::Library) :
-		userDefinedFunction->type()
-	);
+	return dynamic_cast<FunctionType const*>(userDefinedFunction->typeWhenAttached());
 }
 
 BinaryOperationAnnotation& BinaryOperation::annotation() const

libsolidity/ast/AST.h

@@ -1062,6 +1062,7 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 
 	Type const* type() const override;
 	Type const* typeViaContractName(ContractNameAccessKind _accessKind) const override;
+	Type const* typeWhenAttached() const;
 
 	/// @param _internal false indicates external interface is concerned, true indicates internal interface is concerned.
 	/// @returns null when it is not accessible as a function.

libsolidity/ast/Types.cpp

@@ -403,11 +403,7 @@ std::set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefiniti
 			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(
 				*identifierPath->annotation().referencedDeclaration
 			);
-			auto const* functionType = dynamic_cast<FunctionType const*>(
-				functionDefinition.libraryFunction() ?
-				functionDefinition.typeViaContractName(Declaration::ContractNameAccessKind::Library) :
-				functionDefinition.type()
-			);
+			auto const* functionType = dynamic_cast<FunctionType const*>(functionDefinition.typeWhenAttached());
 			solAssert(functionType && !functionType->parameterTypes().empty());
 
 			size_t parameterCount = functionDefinition.parameterList().parameters().size();
@@ -427,8 +423,7 @@ MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const&
 	{
 		if (!_name)
 			_name = _function.name();
-		Type const* functionType =
-			_function.libraryFunction() ? _function.typeViaContractName(Declaration::ContractNameAccessKind::Library) : _function.type();
+		Type const* functionType = _function.typeWhenAttached();
 		solAssert(functionType, "");
 		FunctionType const* withBoundFirstArgument =
 			dynamic_cast<FunctionType const&>(*functionType).withBoundFirstArgument();