diff options
| author | Reid Kleckner <reid@kleckner.net> | 2014-05-09 22:56:42 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2014-05-09 22:56:42 +0000 |
| commit | c487d73f4143aa8d2773152906d999db17fc3640 (patch) | |
| tree | c713fa7c6d73cb3b58c025232ac6d2e5f0b43ae0 /llvm/lib/AsmParser/LLToken.h | |
| parent | 37abaca3c26a4f89e34df356c3ad6018f42580ce (diff) | |
| download | bcm5719-llvm-c487d73f4143aa8d2773152906d999db17fc3640.tar.gz bcm5719-llvm-c487d73f4143aa8d2773152906d999db17fc3640.zip | |
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.
llvm-svn: 208459
Diffstat (limited to 'llvm/lib/AsmParser/LLToken.h')
| -rw-r--r-- | llvm/lib/AsmParser/LLToken.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/AsmParser/LLToken.h b/llvm/lib/AsmParser/LLToken.h index ab5a1a535d9..d5d45312c2a 100644 --- a/llvm/lib/AsmParser/LLToken.h +++ b/llvm/lib/AsmParser/LLToken.h @@ -88,7 +88,7 @@ namespace lltok { kw_cc, kw_ccc, kw_fastcc, kw_coldcc, kw_intel_ocl_bicc, - kw_x86_stdcallcc, kw_x86_fastcallcc, kw_x86_thiscallcc, kw_x86_cdeclmethodcc, + kw_x86_stdcallcc, kw_x86_fastcallcc, kw_x86_thiscallcc, kw_arm_apcscc, kw_arm_aapcscc, kw_arm_aapcs_vfpcc, kw_msp430_intrcc, kw_ptx_kernel, kw_ptx_device, |
