Skip to content

release/22.x: [X86] Fix missing ByValTemporaries update in CopyViaTemp path for musttail calls (#190540) #192507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
c-rhodes merged 1 commit into from
Apr 20, 2026
+46 −13
Merged

release/22.x: [X86] Fix missing ByValTemporaries update in CopyViaTemp path for musttail calls (#190540) #192507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions llvm/lib/Target/X86/X86ISelLoweringCall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2251,6 +2251,7 @@ X86TargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
SDValue CopyChain =
CreateCopyOfByValArgument(Src, Temp, Chain, Flags, DAG, dl);
ByValCopyChains.push_back(CopyChain);
ByValTemporaries[ArgIdx] = Temp;
}
}
if (!ByValCopyChains.empty())
Expand Down
58 changes: 45 additions & 13 deletions llvm/test/CodeGen/X86/musttail-struct.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ define dso_local i32 @swapByValArguments(ptr byval(%struct.1xi32) %0, ptr byval(
; X32-NEXT: .cfi_def_cfa_offset 12
; X32-NEXT: mov eax, dword ptr [esp + 12]
; X32-NEXT: mov dword ptr [esp], eax
; X32-NEXT: mov eax, dword ptr [esp + 16]
; X32-NEXT: mov dword ptr [esp + 4], eax
; X32-NEXT: mov ecx, dword ptr [esp + 16]
; X32-NEXT: mov dword ptr [esp + 4], ecx
; X32-NEXT: mov dword ptr [esp + 12], ecx
; X32-NEXT: mov dword ptr [esp + 16], eax
; X32-NEXT: add esp, 8
; X32-NEXT: .cfi_def_cfa_offset 4
; X32-NEXT: jmp swap # TAILCALL
Expand All @@ -114,8 +116,10 @@ define dso_local i32 @swapByValArguments(ptr byval(%struct.1xi32) %0, ptr byval(
; X64: # %bb.0:
; X64-NEXT: mov eax, dword ptr [rsp + 8]
; X64-NEXT: mov dword ptr [rsp - 16], eax
; X64-NEXT: mov eax, dword ptr [rsp + 16]
; X64-NEXT: mov dword ptr [rsp - 8], eax
; X64-NEXT: mov ecx, dword ptr [rsp + 16]
; X64-NEXT: mov dword ptr [rsp - 8], ecx
; X64-NEXT: mov dword ptr [rsp + 8], ecx
; X64-NEXT: mov dword ptr [rsp + 16], eax
; X64-NEXT: jmp swap # TAILCALL
%r = musttail call i32 @swap(ptr byval(%struct.1xi32) %1, ptr byval(%struct.1xi32) %0)
ret i32 %r
Expand Down Expand Up @@ -218,22 +222,50 @@ define void @swap_byvals(%twenty_bytes* byval(%twenty_bytes) align 4 %a, %twenty
; X32-NEXT: mov ecx, dword ptr [esp + 68]
; X32-NEXT: mov dword ptr [esp + 24], ecx
; X32-NEXT: mov dword ptr [esp + 20], eax
; X32-NEXT: mov eax, dword ptr [esp + 16]
; X32-NEXT: mov dword ptr [esp + 80], eax
; X32-NEXT: mov eax, dword ptr [esp + 12]
; X32-NEXT: mov dword ptr [esp + 76], eax
; X32-NEXT: mov eax, dword ptr [esp + 8]
; X32-NEXT: mov dword ptr [esp + 72], eax
; X32-NEXT: mov eax, dword ptr [esp]
; X32-NEXT: mov ecx, dword ptr [esp + 4]
; X32-NEXT: mov dword ptr [esp + 68], ecx
; X32-NEXT: mov dword ptr [esp + 64], eax
; X32-NEXT: mov eax, dword ptr [esp + 36]
; X32-NEXT: mov dword ptr [esp + 60], eax
; X32-NEXT: mov eax, dword ptr [esp + 32]
; X32-NEXT: mov dword ptr [esp + 56], eax
; X32-NEXT: mov eax, dword ptr [esp + 28]
; X32-NEXT: mov dword ptr [esp + 52], eax
; X32-NEXT: mov eax, dword ptr [esp + 20]
; X32-NEXT: mov ecx, dword ptr [esp + 24]
; X32-NEXT: mov dword ptr [esp + 48], ecx
; X32-NEXT: mov dword ptr [esp + 44], eax
; X32-NEXT: add esp, 40
; X32-NEXT: .cfi_def_cfa_offset 4
; X32-NEXT: jmp two_byvals_callee@PLT # TAILCALL
;
; X64-LABEL: swap_byvals:
; X64: # %bb.0: # %entry
; X64-NEXT: mov eax, dword ptr [rsp + 24]
; X64-NEXT: mov dword ptr [rsp - 8], eax
; X64-NEXT: movaps xmm0, xmmword ptr [rsp + 8]
; X64-NEXT: movaps xmmword ptr [rsp - 24], xmm0
; X64-NEXT: mov eax, dword ptr [rsp + 48]
; X64-NEXT: mov dword ptr [rsp - 32], eax
; X64-NEXT: mov rax, qword ptr [rsp + 32]
; X64-NEXT: mov rcx, qword ptr [rsp + 40]
; X64-NEXT: mov qword ptr [rsp - 40], rcx
; X64-NEXT: mov qword ptr [rsp - 48], rax
; X64-NEXT: movaps xmmword ptr [rsp - 56], xmm0
; X64-NEXT: mov eax, dword ptr [rsp + 24]
; X64-NEXT: mov dword ptr [rsp - 40], eax
; X64-NEXT: mov ecx, dword ptr [rsp + 48]
; X64-NEXT: mov dword ptr [rsp - 8], ecx
; X64-NEXT: mov rdx, qword ptr [rsp + 32]
; X64-NEXT: mov rsi, qword ptr [rsp + 40]
; X64-NEXT: mov qword ptr [rsp - 16], rsi
; X64-NEXT: mov qword ptr [rsp - 24], rdx
; X64-NEXT: mov qword ptr [rsp + 8], rdx
; X64-NEXT: mov qword ptr [rsp + 16], rsi
; X64-NEXT: mov dword ptr [rsp + 24], ecx
; X64-NEXT: mov dword ptr [rsp + 48], eax
; X64-NEXT: mov rax, qword ptr [rsp - 56]
; X64-NEXT: mov rcx, qword ptr [rsp - 48]
; X64-NEXT: mov qword ptr [rsp + 32], rax
; X64-NEXT: mov qword ptr [rsp + 40], rcx
; X64-NEXT: jmp two_byvals_callee@PLT # TAILCALL
entry:
musttail call void @two_byvals_callee(%twenty_bytes* byval(%twenty_bytes) align 4 %b, %twenty_bytes* byval(%twenty_bytes) align 4 %a)
Expand Down
Loading