[llvm][NFC] Consolidate equivalent function type parsing code into single function

[vmurali]

Hi, it looks like this commit broke my compile. I did:

$ cmake -G Ninja ../llvm -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_BUILD_EXAMPLES=ON -DLLVM_TARGETS_TO_BUILD="X86;NVPTX;AMDGPU" -DCMAKE_BUILD_TYPE=Debug -DLLVM_ENABLE_ASSERTIONS=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ENABLE_LLD=ON-DLLVM_CCACHE_BUILD=ON-DMLIR_INCLUDE_INTEGRATION_TESTS=ON
$ cmake --build . --target check-mlir

And I get:

FAILED: lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o 
/usr/bin/clang++ -DBUILD_EXAMPLES -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/local/google/home/muralivi/llvm-project/build/lib/AsmParser -I/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser -I/usr/local/google/home/muralivi/llvm-project/build/include -I/usr/local/google/home/muralivi/llvm-project/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -g  -fno-exceptions -fno-rtti -std=c++17 -MD -MT lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o -MF lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o.d -o lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o -c /usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:66: error: use of undeclared identifier 'ParamInfo'
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
                                                                 ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6429:20: error: use of undeclared identifier 'RetTypeLoc'
      return error(RetTypeLoc, "Invalid result type for LLVM function");
                   ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6470:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6787:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:7183:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
5 errors generated.

[leonardchan]

In D135296#3837838, @vmurali wrote:

Hi, it looks like this commit broke my compile. I did:

$ cmake -G Ninja ../llvm -DLLVM_ENABLE_PROJECTS=mlir -DLLVM_BUILD_EXAMPLES=ON -DLLVM_TARGETS_TO_BUILD="X86;NVPTX;AMDGPU" -DCMAKE_BUILD_TYPE=Debug -DLLVM_ENABLE_ASSERTIONS=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ENABLE_LLD=ON-DLLVM_CCACHE_BUILD=ON-DMLIR_INCLUDE_INTEGRATION_TESTS=ON
$ cmake --build . --target check-mlir

And I get:

FAILED: lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o 
/usr/bin/clang++ -DBUILD_EXAMPLES -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/local/google/home/muralivi/llvm-project/build/lib/AsmParser -I/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser -I/usr/local/google/home/muralivi/llvm-project/build/include -I/usr/local/google/home/muralivi/llvm-project/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -g  -fno-exceptions -fno-rtti -std=c++17 -MD -MT lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o -MF lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o.d -o lib/AsmParser/CMakeFiles/LLVMAsmParser.dir/LLParser.cpp.o -c /usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:66: error: use of undeclared identifier 'ParamInfo'
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
                                                                 ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6429:20: error: use of undeclared identifier 'RetTypeLoc'
      return error(RetTypeLoc, "Invalid result type for LLVM function");
                   ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6470:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6787:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:7183:7: error: no matching function for call to 'resolveFunctionType'
  if (resolveFunctionType(RetType, ArgList, Ty))
      ^~~~~~~~~~~~~~~~~~~
/usr/local/google/home/muralivi/llvm-project/llvm/lib/AsmParser/LLParser.cpp:6420:13: note: candidate function not viable: no known conversion from 'SmallVector<llvm::LLParser::ParamInfo, 16>' to 'const int' for 2nd argument
static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
            ^
5 errors generated.

Does https://reviews.llvm.org/rG34004d2d03a9a4908254ebbe5e60b6c99c9425d8 resolve this for you?

[vmurali]

Yes it does!

llvm/lib/AsmParser/LLParser.cpp

bool LLParser::parseIndirectBr(Instruction *&Inst, PerFunctionState &PFS) {
 
   IndirectBrInst *IBI = IndirectBrInst::Create(Address, DestList.size());
   for (unsigned i = 0, e = DestList.size(); i != e; ++i)
     IBI->addDestination(DestList[i]);
   Inst = IBI;
   return false;
 }
 
+// If RetType is a non-function pointer type, then this is the short syntax
+// for the call, which means that RetType is just the return type.  Infer the
+// rest of the function argument types from the arguments that are present.
+static bool resolveFunctionType(Type *RetType, const SmallVector<ParamInfo, 16> &ArgList, FunctionType *&FuncTy) {
+  FuncTy = dyn_cast<FunctionType>(RetType);
+  if (!FuncTy) {
+    // Pull out the types of all of the arguments...
+    std::vector<Type*> ParamTypes;
+    for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
+      ParamTypes.push_back(ArgList[i].V->getType());
+
+    if (!FunctionType::isValidReturnType(RetType))
+      return error(RetTypeLoc, "Invalid result type for LLVM function");
+
+    FuncTy = FunctionType::get(RetType, ParamTypes, false);
+  }
+  return false;
+}
+
 /// parseInvoke
 ///   ::= 'invoke' OptionalCallingConv OptionalAttrs Type Value ParamList
 ///       OptionalAttrs 'to' TypeAndValue 'unwind' TypeAndValue
 bool LLParser::parseInvoke(Instruction *&Inst, PerFunctionState &PFS) {
   LocTy CallLoc = Lex.getLoc();
   AttrBuilder RetAttrs(M->getContext()), FnAttrs(M->getContext());
   std::vector<unsigned> FwdRefAttrGrps;
   LocTy NoBuiltinLoc;
if (parseOptionalCallingConv(CC) || parseOptionalReturnAttrs(RetAttrs) ||
       parseTypeAndBasicBlock(NormalBB, PFS) ||
       parseToken(lltok::kw_unwind, "expected 'unwind' in invoke") ||
       parseTypeAndBasicBlock(UnwindBB, PFS))
     return true;
 
   // If RetType is a non-function pointer type, then this is the short syntax
   // for the call, which means that RetType is just the return type.  Infer the
   // rest of the function argument types from the arguments that are present.
-  FunctionType *Ty = dyn_cast<FunctionType>(RetType);
-  if (!Ty) {
-    // Pull out the types of all of the arguments...
-    std::vector<Type*> ParamTypes;
-    for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
-      ParamTypes.push_back(ArgList[i].V->getType());
-
-    if (!FunctionType::isValidReturnType(RetType))
-      return error(RetTypeLoc, "Invalid result type for LLVM function");
-
-    Ty = FunctionType::get(RetType, ParamTypes, false);
-  }
+  FunctionType *Ty;
+  if (resolveFunctionType(RetType, ArgList, Ty))
+    return true;
 
   CalleeID.FTy = Ty;
 
   // Look up the callee.
   Value *Callee;
   if (convertValIDToValue(PointerType::get(Ty, InvokeAddrSpace), CalleeID,
                           Callee, &PFS))
     return true;
bool LLParser::parseCallBr(Instruction *&Inst, PerFunctionState &PFS) {
   }
 
   if (parseToken(lltok::rsquare, "expected ']' at end of block list"))
     return true;
 
   // If RetType is a non-function pointer type, then this is the short syntax
   // for the call, which means that RetType is just the return type.  Infer the
   // rest of the function argument types from the arguments that are present.
-  FunctionType *Ty = dyn_cast<FunctionType>(RetType);
-  if (!Ty) {
-    // Pull out the types of all of the arguments...
-    std::vector<Type *> ParamTypes;
-    for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
-      ParamTypes.push_back(ArgList[i].V->getType());
-
-    if (!FunctionType::isValidReturnType(RetType))
-      return error(RetTypeLoc, "Invalid result type for LLVM function");
-
-    Ty = FunctionType::get(RetType, ParamTypes, false);
-  }
+  FunctionType *Ty;
+  if (resolveFunctionType(RetType, ArgList, Ty))
+    return true;
 
   CalleeID.FTy = Ty;
 
   // Look up the callee.
   Value *Callee;
   if (convertValIDToValue(PointerType::getUnqual(Ty), CalleeID, Callee, &PFS))
     return true;
 
if (parseOptionalCallingConv(CC) || parseOptionalReturnAttrs(RetAttrs) ||
                          PFS.getFunction().isVarArg()) ||
       parseFnAttributeValuePairs(FnAttrs, FwdRefAttrGrps, false, BuiltinLoc) ||
       parseOptionalOperandBundles(BundleList, PFS))
     return true;
 
   // If RetType is a non-function pointer type, then this is the short syntax
   // for the call, which means that RetType is just the return type.  Infer the
   // rest of the function argument types from the arguments that are present.
-  FunctionType *Ty = dyn_cast<FunctionType>(RetType);
-  if (!Ty) {
-    // Pull out the types of all of the arguments...
-    std::vector<Type*> ParamTypes;
-    for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
-      ParamTypes.push_back(ArgList[i].V->getType());
-
-    if (!FunctionType::isValidReturnType(RetType))
-      return error(RetTypeLoc, "Invalid result type for LLVM function");
-
-    Ty = FunctionType::get(RetType, ParamTypes, false);
-  }
+  FunctionType *Ty;
+  if (resolveFunctionType(RetType, ArgList, Ty))
+    return true;
 
   CalleeID.FTy = Ty;
 
   // Look up the callee.
   Value *Callee;
   if (convertValIDToValue(PointerType::get(Ty, CallAddrSpace), CalleeID, Callee,
                           &PFS))
     return true;