summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNico Rieck <nico.rieck@gmail.com>2013-07-06 18:08:19 +0000
committerNico Rieck <nico.rieck@gmail.com>2013-07-06 18:08:19 +0000
commit2b52880592a525cfe04d8f9008a35da8c2ea94c3 (patch)
tree158b30fff8e7d0556216915ee4da86c88d267c82 /lib
parent28bb04453d82bd680e84cd2617ce94f633dc3249 (diff)
downloadllvm-2b52880592a525cfe04d8f9008a35da8c2ea94c3.tar.gz
llvm-2b52880592a525cfe04d8f9008a35da8c2ea94c3.tar.bz2
llvm-2b52880592a525cfe04d8f9008a35da8c2ea94c3.tar.xz
Proper va_arg/va_copy lowering on win64
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185763 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/X86/X86ISelLowering.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 174cc4602d..a6e894b7ca 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -582,10 +582,12 @@ void X86TargetLowering::resetOperationActions() {
// VASTART needs to be custom lowered to use the VarArgsFrameIndex
setOperationAction(ISD::VASTART , MVT::Other, Custom);
setOperationAction(ISD::VAEND , MVT::Other, Expand);
- if (Subtarget->is64Bit()) {
+ if (Subtarget->is64Bit() && !Subtarget->isTargetWin64()) {
+ // TargetInfo::X86_64ABIBuiltinVaList
setOperationAction(ISD::VAARG , MVT::Other, Custom);
setOperationAction(ISD::VACOPY , MVT::Other, Custom);
} else {
+ // TargetInfo::CharPtrBuiltinVaList
setOperationAction(ISD::VAARG , MVT::Other, Expand);
setOperationAction(ISD::VACOPY , MVT::Other, Expand);
}