Closes #33

Author: gmh5225

llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h

@@ -623,6 +623,9 @@ struct FunctionSymbolNode : public SymbolNode {
   FunctionSignatureNode *Signature = nullptr;
 };
 
+std::string
+getCallingConventionNameByDemangledName(std::string_view DemangledName);
+
 } // namespace ms_demangle
 } // namespace llvm
 

llvm/lib/Demangle/Demangle.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Demangle/Demangle.h"
+#include "llvm/Demangle/MicrosoftDemangleNodes.h"
 #include "llvm/Demangle/StringViewExtras.h"
 #include <cstdlib>
 #include <string_view>
@@ -19,11 +20,21 @@ using llvm::itanium_demangle::starts_with;
 
 /// demangle a string to get the function name.
 std::string llvm::demangleGetFunctionName(std::string_view MangledName) {
+  std::string Result;
+  if (nonMicrosoftDemangle(MangledName, Result))
+    return Result;
+
   std::string DemangledStr = llvm::demangle(MangledName);
+  std::string CCName =
+      llvm::ms_demangle::getCallingConventionNameByDemangledName(DemangledStr);
+  if (CCName.empty())
+    return DemangledStr;
+
   size_t StartIndex = DemangledStr.find("(");
   if (StartIndex != std::string::npos) {
-    size_t EndIndex = DemangledStr.rfind(" ", StartIndex);
+    size_t EndIndex = DemangledStr.find(CCName + " ");
     if (EndIndex != std::string::npos) {
+      EndIndex += CCName.size();
       DemangledStr =
           DemangledStr.substr(EndIndex + 1, StartIndex - EndIndex - 1);
     }

llvm/lib/Demangle/MicrosoftDemangleNodes.cpp

@@ -117,6 +117,29 @@ static void outputCallingConvention(OutputBuffer &OB, CallingConv CC) {
   }
 }
 
+std::string llvm::ms_demangle::getCallingConventionNameByDemangledName(
+    std::string_view DemangledName) {
+  if (DemangledName.find("__cdecl") != std::string::npos)
+    return "__cdecl";
+  if (DemangledName.find("__fastcall") != std::string::npos)
+    return "__fastcall";
+  if (DemangledName.find("__stdcall") != std::string::npos)
+    return "__stdcall";
+  if (DemangledName.find("__thiscall") != std::string::npos)
+    return "__thiscall";
+  if (DemangledName.find("__pascal") != std::string::npos)
+    return "__pascal";
+  if (DemangledName.find("__regcall") != std::string::npos)
+    return "__regcall";
+  if (DemangledName.find("__eabi") != std::string::npos)
+    return "__eabi";
+  if (DemangledName.find("__vectorcall") != std::string::npos)
+    return "__vectorcall";
+  if (DemangledName.find("__clrcall") != std::string::npos)
+    return "__clrcall";
+  return "";
+}
+
 std::string Node::toString(OutputFlags Flags) const {
   OutputBuffer OB;
   this->output(OB, Flags);