Add CC_Win64ThisCall and set it in the necessary places.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@126863 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 5 insertions, 0 deletions

diff --git a/lib/AST/DumpXML.cpp b/lib/AST/DumpXML.cpp
index 9d828fcfb8..4f548b265c 100644
--- a/lib/AST/DumpXML.cpp
+++ b/lib/AST/DumpXML.cpp
@@ -911,6 +911,7 @@ struct XMLDumper : public XMLDeclVisitor<XMLDumper>,
     case CC_X86StdCall: return set("cc", "x86_stdcall");
     case CC_X86ThisCall: return set("cc", "x86_thiscall");
     case CC_X86Pascal: return set("cc", "x86_pascal");
+    case CC_Win64ThisCall: return set("cc", "win64_thiscall");
     }
   }
 
diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index 4bf7f23a0a..f5bdd4b537 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -879,6 +879,9 @@ void MicrosoftCXXNameMangler::mangleCallingConvention(const FunctionType *T,
     case CC_X86ThisCall: Out << 'E'; break;
     case CC_X86StdCall: Out << 'G'; break;
     case CC_X86FastCall: Out << 'I'; break;
+    case CC_Win64ThisCall:
+      assert(false && "Don't know how to mangle Win64 thiscall cc yet!");
+      break;
   }
 }
 void MicrosoftCXXNameMangler::mangleThrowSpecification(
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index cde865f5b9..2cab221448 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -1157,6 +1157,7 @@ llvm::StringRef FunctionType::getNameForCallConv(CallingConv CC) {
   case CC_X86FastCall: return "fastcall";
   case CC_X86ThisCall: return "thiscall";
   case CC_X86Pascal: return "pascal";
+  case CC_Win64ThisCall: return "win64_thiscall";
   }
 
   llvm_unreachable("Invalid calling convention.");