diff options
author | Bill Wendling <isanbard@gmail.com> | 2011-03-22 00:19:46 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2011-03-22 00:19:46 +0000 |
commit | 59fb1a0544547dc3a17072544d09d95f97cb9235 (patch) | |
tree | fbd04f914b1d40b0c706b3129eba34202ee8f045 | |
parent | 265fa1236d4c148c7d77a842c8462bf873001ede (diff) | |
download | llvm-59fb1a0544547dc3a17072544d09d95f97cb9235.zip llvm-59fb1a0544547dc3a17072544d09d95f97cb9235.tar.gz llvm-59fb1a0544547dc3a17072544d09d95f97cb9235.tar.bz2 |
Fix Win64 va_arg.
--- Merging r127328 into '.':
U test/CodeGen/X86/win64_vararg.ll
U lib/Target/X86/X86ISelLowering.cpp
llvm-svn: 128044
-rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 8 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/win64_vararg.ll | 33 |
2 files changed, 38 insertions, 3 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 4f8132d..5b9dc75 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -1750,8 +1750,8 @@ X86TargetLowering::LowerFormalArguments(SDValue Chain, // If the function takes variable number of arguments, make a frame index for // the start of the first vararg value... for expansion of llvm.va_start. if (isVarArg) { - if (!IsWin64 && (Is64Bit || (CallConv != CallingConv::X86_FastCall && - CallConv != CallingConv::X86_ThisCall))) { + if (Is64Bit || (CallConv != CallingConv::X86_FastCall && + CallConv != CallingConv::X86_ThisCall)) { FuncInfo->setVarArgsFrameIndex(MFI->CreateFixedObject(1, StackSize,true)); } if (Is64Bit) { @@ -1803,7 +1803,9 @@ X86TargetLowering::LowerFormalArguments(SDValue Chain, int HomeOffset = TFI.getOffsetOfLocalArea() + 8; FuncInfo->setRegSaveFrameIndex( MFI->CreateFixedObject(1, NumIntRegs * 8 + HomeOffset, false)); - FuncInfo->setVarArgsFrameIndex(FuncInfo->getRegSaveFrameIndex()); + // Fixup to set vararg frame on shadow area (4 x i64). + if (NumIntRegs < 4) + FuncInfo->setVarArgsFrameIndex(FuncInfo->getRegSaveFrameIndex()); } else { // For X86-64, if there are vararg parameters that are passed via // registers, then we must store them to their spots on the stack so they diff --git a/llvm/test/CodeGen/X86/win64_vararg.ll b/llvm/test/CodeGen/X86/win64_vararg.ll index a451318..efe8bca 100644 --- a/llvm/test/CodeGen/X86/win64_vararg.ll +++ b/llvm/test/CodeGen/X86/win64_vararg.ll @@ -18,3 +18,36 @@ entry: } declare void @llvm.va_start(i8*) nounwind + +; CHECK: f5: +; CHECK: pushq +; CHECK: leaq 56(%rsp), +define i8* @f5(i64 %a0, i64 %a1, i64 %a2, i64 %a3, i64 %a4, ...) nounwind { +entry: + %ap = alloca i8*, align 8 + %ap1 = bitcast i8** %ap to i8* + call void @llvm.va_start(i8* %ap1) + ret i8* %ap1 +} + +; CHECK: f4: +; CHECK: pushq +; CHECK: leaq 48(%rsp), +define i8* @f4(i64 %a0, i64 %a1, i64 %a2, i64 %a3, ...) nounwind { +entry: + %ap = alloca i8*, align 8 + %ap1 = bitcast i8** %ap to i8* + call void @llvm.va_start(i8* %ap1) + ret i8* %ap1 +} + +; CHECK: f3: +; CHECK: pushq +; CHECK: leaq 40(%rsp), +define i8* @f3(i64 %a0, i64 %a1, i64 %a2, ...) nounwind { +entry: + %ap = alloca i8*, align 8 + %ap1 = bitcast i8** %ap to i8* + call void @llvm.va_start(i8* %ap1) + ret i8* %ap1 +} |