diff options
| author | Nico Rieck <nico.rieck@gmail.com> | 2013-07-06 18:08:19 +0000 |
|---|---|---|
| committer | Nico Rieck <nico.rieck@gmail.com> | 2013-07-06 18:08:19 +0000 |
| commit | 99ef2890c0d0d576c86001e2b8fe87f7893f21f6 (patch) | |
| tree | 9b889e8e1c4688bdc4d6c3bd6b99e8586523a2c3 /llvm/lib | |
| parent | ae26bb67f8ed2c509765c43bf9865e795439cd31 (diff) | |
| download | bcm5719-llvm-99ef2890c0d0d576c86001e2b8fe87f7893f21f6.tar.gz bcm5719-llvm-99ef2890c0d0d576c86001e2b8fe87f7893f21f6.zip | |
Proper va_arg/va_copy lowering on win64
llvm-svn: 185763
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 174cc4602d9..a6e894b7cab 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/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); } |
