Index: test/tools/llvm-pdbdump/Inputs/PrettyFuncDumperTest.cpp
===================================================================
--- /dev/null
+++ test/tools/llvm-pdbdump/Inputs/PrettyFuncDumperTest.cpp
@@ -0,0 +1,46 @@
+// Compile with "cl /c /Zi /GR- PrettyFuncDumperTest.cpp"
+// Link with "link PrettyFuncDumperTest.obj /debug /nodefaultlib /entry:main"
+
+typedef void (*FuncPtrA)();
+FuncPtrA FuncVarA;
+
+typedef float (*FuncPtrB)(void);
+FuncPtrB FuncVarB;
+
+typedef int(*VariadicFuncPtrTypedef)(char, double, ...);
+VariadicFuncPtrTypedef VariadicFuncVar;
+
+void Func(int array[]) { return; }
+
+template <int N=1, class ...T>
+void TemplateFunc(T ...Arg) {
+  return;
+}
+
+namespace {
+  void Func(int& a, const double b, volatile bool c) { return; }
+}
+
+namespace NS {
+  void Func(char a, int b, ...) {
+    return;
+  }
+}
+
+namespace MemberFuncsTest {
+  class A {
+  public:
+    int FuncA() { return 1; }
+  };
+}
+
+int main() {
+  MemberFuncsTest::A v1;
+  v1.FuncA();
+
+  NS::Func('c', 2, 10, 100);
+
+  TemplateFunc(10);
+  TemplateFunc(10, 11, 88);
+  return 0;
+}
Index: test/tools/llvm-pdbdump/pretty-func-dumper.test
===================================================================
--- /dev/null
+++ test/tools/llvm-pdbdump/pretty-func-dumper.test
@@ -0,0 +1,24 @@
+; RUN: llvm-pdbutil pretty -all -class-recurse-depth=1 \
+; RUN:   %p/Inputs/PrettyFuncDumperTest.pdb > %t
+; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_FUNC
+; RUN: FileCheck -input-file=%t %s -check-prefix=GLOBALS_DATA
+; RUN: FileCheck -input-file=%t %s -check-prefix=TYPEDEF
+
+; GLOBALS_FUNC: ---GLOBALS---
+; GLOBALS_FUNC-DAG: void __cdecl NS::Func(char a, int b, ...)
+; GLOBALS_FUNC-DAG: void __cdecl TemplateFunc<1,int>(int <Arg_0>)
+; GLOBALS_FUNC-DAG: void __cdecl TemplateFunc<1,int,int,int>(int <Arg_0>, int <Arg_1>, int <Arg_2>)
+; GLOBALS_FUNC-DAG: void __cdecl `anonymous namespace'::Func(int& a, const double b, volatile bool c)
+; GLOBALS_FUNC-DAG: void __cdecl Func(int* array)
+; GLOBALS_FUNC-DAG: int MemberFuncsTest::A::FuncA()
+
+; GLOBALS_DATA: ---GLOBALS---
+; GLOBALS_DATA-DAG: void (__cdecl * FuncVarA)()
+; GLOBALS_DATA-DAG: float (__cdecl * FuncVarB)()
+; GLOBALS_DATA-DAG: int (__cdecl * VariadicFuncVar)(char, double, ...)
+
+; TYPEDEF: ---TYPES---
+; TYPEDEF: Typedefs:
+; TYPEDEF-DAG: typedef void (__cdecl *)() FuncPtrA
+; TYPEDEF-DAG: typedef int (__cdecl *)(char, double, ...) VariadicFuncPtrTypedef
+; TYPEDEF-DAG: typedef float (__cdecl *)() FuncPtrB
Index: tools/llvm-pdbutil/PrettyBuiltinDumper.cpp
===================================================================
--- tools/llvm-pdbutil/PrettyBuiltinDumper.cpp
+++ tools/llvm-pdbutil/PrettyBuiltinDumper.cpp
@@ -87,6 +87,8 @@
     return "HRESULT";
   case PDB_BuiltinType::BCD:
     return "HRESULT";
+  case PDB_BuiltinType::None:
+    return "...";
   default:
     return "void";
   }
Index: tools/llvm-pdbutil/PrettyFunctionDumper.cpp
===================================================================
--- tools/llvm-pdbutil/PrettyFunctionDumper.cpp
+++ tools/llvm-pdbutil/PrettyFunctionDumper.cpp
@@ -189,6 +189,10 @@
       if (++Index < Arguments->getChildCount())
         Printer << ", ";
     }
+    if (auto SigArguments = Signature->getArguments()) {
+      if (SigArguments->getChildCount() > Arguments->getChildCount())
+        Printer << ", ...";
+    }
   }
   Printer << ")";
   if (Symbol.isConstType())