summaryrefslogtreecommitdiff
path: root/lib/IR
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-05-09 22:56:42 +0000
committerReid Kleckner <reid@kleckner.net>2014-05-09 22:56:42 +0000
commitd30c11eddee0c6f17a65303c249b77d14962c973 (patch)
treea204ca35123d20da51f2add45cfad7bc9bb6fda2 /lib/IR
parent754e940865aaf63be79dcb921572eff4b1042c7c (diff)
downloadllvm-d30c11eddee0c6f17a65303c249b77d14962c973.tar.gz
llvm-d30c11eddee0c6f17a65303c249b77d14962c973.tar.bz2
llvm-d30c11eddee0c6f17a65303c249b77d14962c973.tar.xz
Revert "[ms-cxxabi] Add a new calling convention that swaps 'this' and 'sret'"
This reverts commit r200561. This calling convention was an attempt to match the MSVC C++ ABI for methods that return structures by value. This solution didn't scale, because it would have required splitting every CC available on Windows into two: one for methods and one for free functions. Now that we can put sret on the second arg (r208453), and Clang does that (r208458), revert this hack. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208459 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR')
-rw-r--r--lib/IR/AsmWriter.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp
index 3e716d13d3..3cbb1d1049 100644
--- a/lib/IR/AsmWriter.cpp
+++ b/lib/IR/AsmWriter.cpp
@@ -78,7 +78,6 @@ static void PrintCallingConv(unsigned cc, raw_ostream &Out) {
case CallingConv::X86_StdCall: Out << "x86_stdcallcc"; break;
case CallingConv::X86_FastCall: Out << "x86_fastcallcc"; break;
case CallingConv::X86_ThisCall: Out << "x86_thiscallcc"; break;
- case CallingConv::X86_CDeclMethod:Out << "x86_cdeclmethodcc"; break;
case CallingConv::Intel_OCL_BI: Out << "intel_ocl_bicc"; break;
case CallingConv::ARM_APCS: Out << "arm_apcscc"; break;
case CallingConv::ARM_AAPCS: Out << "arm_aapcscc"; break;