[llvm] r185763 - Proper va_arg/va_copy lowering on win64

[Chandler Carruth]

Nico, this patch was never reviewed. Please, *do not* commit without
review. This is not the first time this has happened. Revert immediately.


On Sat, Jul 6, 2013 at 11:08 AM, Nico Rieck <nico.rieck at gmail.com> wrote:

> Author: nrieck
> Date: Sat Jul  6 13:08:19 2013
> New Revision: 185763
>
> URL: http://llvm.org/viewvc/llvm-project?rev=185763&view=rev
> Log:
> Proper va_arg/va_copy lowering on win64
>
> Modified:
>     llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
>     llvm/trunk/test/CodeGen/X86/win64_vararg.ll
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=185763&r1=185762&r2=185763&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sat Jul  6 13:08:19 2013
> @@ -582,10 +582,12 @@ void X86TargetLowering::resetOperationAc
>    // 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);
>    }
>
> Modified: llvm/trunk/test/CodeGen/X86/win64_vararg.ll
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/win64_vararg.ll?rev=185763&r1=185762&r2=185763&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/win64_vararg.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/win64_vararg.ll Sat Jul  6 13:08:19 2013
> @@ -18,6 +18,7 @@ entry:
>  }
>
>  declare void @llvm.va_start(i8*) nounwind
> +declare void @llvm.va_copy(i8*, i8*) nounwind
>
>  ; CHECK: f5:
>  ; CHECK: pushq
> @@ -51,3 +52,61 @@ entry:
>    call void @llvm.va_start(i8* %ap1)
>    ret i8* %ap1
>  }
> +
> +; WinX86_64 uses char* for va_list. Verify that the correct amount of
> bytes
> +; are copied using va_copy.
> +; CHECK: copy4:
> +; CHECK: subq $16
> +; CHECK: leaq 56(%rsp), [[REGISTER:%[a-z]+]]
> +; CHECK: movq [[REGISTER]], 8(%rsp)
> +; CHECK: movq [[REGISTER]], (%rsp)
> +; CHECK: addq $16
> +; CHECK: ret
> +define void @copy4(i64 %a0, i64 %a1, i64 %a2, i64 %a3, ...) nounwind {
> +entry:
> +  %ap = alloca i8*, align 8
> +  %cp = alloca i8*, align 8
> +  %ap1 = bitcast i8** %ap to i8*
> +  %cp1 = bitcast i8** %cp to i8*
> +  call void @llvm.va_start(i8* %ap1)
> +  call void @llvm.va_copy(i8* %cp1, i8* %ap1)
> +  ret void
> +}
> +
> +; CHECK: copy1:
> +; CHECK: subq $16
> +; CHECK: leaq 32(%rsp), [[REGISTER:%[a-z]+]]
> +; CHECK: movq [[REGISTER]], 8(%rsp)
> +; CHECK: movq [[REGISTER]], (%rsp)
> +; CHECK: addq $16
> +; CHECK: ret
> +define void @copy1(i64 %a0, ...) nounwind {
> +entry:
> +  %ap = alloca i8*, align 8
> +  %cp = alloca i8*, align 8
> +  %ap1 = bitcast i8** %ap to i8*
> +  %cp1 = bitcast i8** %cp to i8*
> +  call void @llvm.va_start(i8* %ap1)
> +  call void @llvm.va_copy(i8* %cp1, i8* %ap1)
> +  ret void
> +}
> +
> +; CHECK: arg4:
> +; CHECK: pushq
> +; va_start:
> +; CHECK: leaq 48(%rsp), [[REG1:%[a-z]+]]
> +; CHECK: movq [[REG1]], (%rsp)
> +; va_arg:
> +; CHECK: leaq 52(%rsp), [[REG2:%[a-z]+]]
> +; CHECK: movq [[REG2]], (%rsp)
> +; CHECK: movl 48(%rsp), %eax
> +; CHECK: popq
> +; CHECK: ret
> +define i32 @arg4(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)
> +  %tmp = va_arg i8** %ap, i32
> +  ret i32 %tmp
> +}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130707/caf3de1f/attachment.html>