Use X86_thiscall calling convention for Win64 as well.

llvm-svn: 126934

6 files changed, 2 insertions, 12 deletions

diff --git a/llvm/include/llvm/CallingConv.h b/llvm/include/llvm/CallingConv.h
index 49dcbb8e800..4c5ee626709 100644
--- a/llvm/include/llvm/CallingConv.h
+++ b/llvm/include/llvm/CallingConv.h
@@ -94,10 +94,7 @@ namespace CallingConv {
 
     /// MBLAZE_INTR - Calling convention used for MBlaze interrupt support
     /// routines (i.e. GCC's save_volatiles attribute).
-    MBLAZE_SVOL = 74,
-
-    /// Win64_ThisCall - Calling convention used for method calls on Win64.
-    Win64_ThisCall = 75
+    MBLAZE_SVOL = 74
   };
 } // End CallingConv namespace
 
diff --git a/llvm/lib/AsmParser/LLLexer.cpp b/llvm/lib/AsmParser/LLLexer.cpp
index c8bbd051f6d..857fa1ef626 100644
--- a/llvm/lib/AsmParser/LLLexer.cpp
+++ b/llvm/lib/AsmParser/LLLexer.cpp
@@ -549,7 +549,6 @@ lltok::Kind LLLexer::LexIdentifier() {
   KEYWORD(msp430_intrcc);
   KEYWORD(ptx_kernel);
   KEYWORD(ptx_device);
-  KEYWORD(win64_thiscallcc);
 
   KEYWORD(cc);
   KEYWORD(c);
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index ed97b401db8..fc10c040547 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -1087,7 +1087,6 @@ bool LLParser::ParseOptionalVisibility(unsigned &Res) {
 ///   ::= 'msp430_intrcc'
 ///   ::= 'ptx_kernel'
 ///   ::= 'ptx_device'
-///   ::= 'win64_thiscallcc'
 ///   ::= 'cc' UINT
 ///
 bool LLParser::ParseOptionalCallingConv(CallingConv::ID &CC) {
@@ -1105,7 +1104,6 @@ bool LLParser::ParseOptionalCallingConv(CallingConv::ID &CC) {
   case lltok::kw_msp430_intrcc:  CC = CallingConv::MSP430_INTR; break;
   case lltok::kw_ptx_kernel:     CC = CallingConv::PTX_Kernel; break;
   case lltok::kw_ptx_device:     CC = CallingConv::PTX_Device; break;
-  case lltok::kw_win64_thiscallcc:CC = CallingConv::Win64_ThisCall; break;
   case lltok::kw_cc: {
       unsigned ArbitraryCC;
       Lex.Lex();
diff --git a/llvm/lib/AsmParser/LLToken.h b/llvm/lib/AsmParser/LLToken.h
index 7f36637292b..576da191aec 100644
--- a/llvm/lib/AsmParser/LLToken.h
+++ b/llvm/lib/AsmParser/LLToken.h
@@ -74,7 +74,6 @@ namespace lltok {
     kw_arm_apcscc, kw_arm_aapcscc, kw_arm_aapcs_vfpcc,
     kw_msp430_intrcc,
     kw_ptx_kernel, kw_ptx_device,
-    kw_win64_thiscallcc,
 
     kw_signext,
     kw_zeroext,
diff --git a/llvm/lib/Target/X86/X86CallingConv.td b/llvm/lib/Target/X86/X86CallingConv.td
index ad71d8fd225..56351756e8d 100644
--- a/llvm/lib/Target/X86/X86CallingConv.td
+++ b/llvm/lib/Target/X86/X86CallingConv.td
@@ -218,7 +218,7 @@ def CC_X86_Win64_C : CallingConv<[
   
   // Do not pass the sret argument in RCX, the Win64 thiscall calling
   // convention requires "this" to be passed in RCX.                                        
-  CCIfCC<"CallingConv::Win64_ThisCall", 
+  CCIfCC<"CallingConv::X86_ThisCall", 
     CCIfSRet<CCIfType<[i64], CCAssignToRegWithShadow<[RDX , R8  , R9  ],
                                                      [XMM1, XMM2, XMM3]>>>>,
 
diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index 62c65dfd32e..ff6084d8a8b 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -1586,7 +1586,6 @@ void AssemblyWriter::printFunction(const Function *F) {
   case CallingConv::MSP430_INTR:  Out << "msp430_intrcc "; break;
   case CallingConv::PTX_Kernel:   Out << "ptx_kernel"; break;
   case CallingConv::PTX_Device:   Out << "ptx_device"; break;
-  case CallingConv::Win64_ThisCall:Out << "win64_thiscallcc "; break;
   default: Out << "cc" << F->getCallingConv() << " "; break;
   }
 
@@ -1859,7 +1858,6 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
     case CallingConv::MSP430_INTR:  Out << " msp430_intrcc "; break;
     case CallingConv::PTX_Kernel:   Out << " ptx_kernel"; break;
     case CallingConv::PTX_Device:   Out << " ptx_device"; break;
-    case CallingConv::Win64_ThisCall:Out << " win64_thiscallcc "; break;
     default: Out << " cc" << CI->getCallingConv(); break;
     }
 
@@ -1916,7 +1914,6 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
     case CallingConv::MSP430_INTR:  Out << " msp430_intrcc "; break;
     case CallingConv::PTX_Kernel:   Out << " ptx_kernel"; break;
     case CallingConv::PTX_Device:   Out << " ptx_device"; break;
-    case CallingConv::Win64_ThisCall:Out << " win64_thiscallcc "; break;
     default: Out << " cc" << II->getCallingConv(); break;
     }