Cleanup: addressing review.

Author: paschalis-mpeis

llvm/include/llvm/Analysis/VectorUtils.h

@@ -200,8 +200,8 @@ void getVectorVariantNames(const CallInst &CI,
 /// TargetLibraryInfo. It uses \p ScalarFTy for the types, and \p Info to get
 /// the vectorization factor and whether a particular parameter is indeed a
 /// vector, since some of them may be scalars.
-std::optional<FunctionType *> createFunctionType(const VFInfo &Info,
-                                                 const FunctionType *ScalarFTy);
+FunctionType *createFunctionType(const VFInfo &Info,
+                                 const FunctionType *ScalarFTy);
 } // end namespace VFABI
 
 /// The Vector Function Database.

llvm/lib/Analysis/VectorUtils.cpp

@@ -1480,8 +1480,8 @@ void VFABI::getVectorVariantNames(
   }
 }
 
-std::optional<FunctionType *>
-VFABI::createFunctionType(const VFInfo &Info, const FunctionType *ScalarFTy) {
+FunctionType *VFABI::createFunctionType(const VFInfo &Info,
+                                        const FunctionType *ScalarFTy) {
   ElementCount VF = Info.Shape.VF;
   // Create vector parameter types
   SmallVector<Type *, 8> VecTypes;
@@ -1493,22 +1493,17 @@ VFABI::createFunctionType(const VFInfo &Info, const FunctionType *ScalarFTy) {
   }
 
   // Get mask's position mask and append one if not present in the Instruction.
-  int MaskPos = -1;
-  if (Info.isMasked()) {
-    auto OptMaskPos = Info.getParamIndexForOptionalMask();
+  if (auto OptMaskPos = Info.getParamIndexForOptionalMask()) {
     if (!OptMaskPos)
-      return std::nullopt;
-
-    MaskPos = OptMaskPos.value();
+      return nullptr;
     VectorType *MaskTy =
         VectorType::get(Type::getInt1Ty(ScalarFTy->getContext()), VF);
-    VecTypes.insert(VecTypes.begin() + MaskPos, MaskTy);
+    VecTypes.insert(VecTypes.begin() + OptMaskPos.value(), MaskTy);
   }
   auto *RetTy = ScalarFTy->getReturnType();
   if (!RetTy->isVoidTy())
     RetTy = VectorType::get(ScalarFTy->getReturnType(), VF);
-  FunctionType *VecFTy = FunctionType::get(RetTy, VecTypes, false);
-  return VecFTy;
+  return FunctionType::get(RetTy, VecTypes, false);
 }
 
 bool VFShape::hasValidParameterList() const {

llvm/unittests/Analysis/VectorFunctionABITest.cpp

@@ -126,11 +126,10 @@ class VFABIParserTest : public ::testing::Test {
 
     // Use VFInfo and the mock CallInst to create a FunctionType that will
     // include a mask when relevant.
-    auto OptVecFTy = VFABI::createFunctionType(Info, ScalarFTy);
-    if (!OptVecFTy)
+    FunctionType *VecFTy = VFABI::createFunctionType(Info, ScalarFTy);
+    if (!VecFTy)
       return false;
 
-    FunctionType *VecFTy = *OptVecFTy;
     // Check that vectorized parameters' size match with VFInfo.
     // Both may include a mask.
     if ((VecFTy->getNumParams() != Info.Shape.Parameters.size()))