diff options
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/win64-funclet-savexmm.ll | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index a8f9c43312a..3374cd054a6 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -1860,7 +1860,7 @@ int X86FrameLowering::getWin64EHFrameIndexRef(const MachineFunction &MF, return getFrameIndexReference(MF, FI, FrameReg); FrameReg = TRI->getStackRegister(); - return alignTo(MFI.getMaxCallFrameSize(), getStackAlignment()) + it->second; + return alignDown(MFI.getMaxCallFrameSize(), getStackAlignment()) + it->second; } int X86FrameLowering::getFrameIndexReferenceSP(const MachineFunction &MF, diff --git a/llvm/test/CodeGen/X86/win64-funclet-savexmm.ll b/llvm/test/CodeGen/X86/win64-funclet-savexmm.ll index b3f9c32210f..9aca63e703e 100644 --- a/llvm/test/CodeGen/X86/win64-funclet-savexmm.ll +++ b/llvm/test/CodeGen/X86/win64-funclet-savexmm.ll @@ -85,17 +85,17 @@ try.cont: ; preds = %catchret.dest, %inv ; CHECK: subq $88, %rsp ; CHECK: .seh_stackalloc 88 ; CHECK: leaq 112(%rdx), %rbp -; CHECK: vmovaps %xmm8, 48(%rsp) -; CHECK: .seh_savexmm %xmm8, 48 -; CHECK: vmovaps %xmm7, 64(%rsp) -; CHECK: .seh_savexmm %xmm7, 64 -; CHECK: vmovaps %xmm6, 80(%rsp) -; CHECK: .seh_savexmm %xmm6, 80 +; CHECK: vmovaps %xmm8, 32(%rsp) +; CHECK: .seh_savexmm %xmm8, 32 +; CHECK: vmovaps %xmm7, 48(%rsp) +; CHECK: .seh_savexmm %xmm7, 48 +; CHECK: vmovaps %xmm6, 64(%rsp) +; CHECK: .seh_savexmm %xmm6, 64 ; CHECK: .seh_endprologue ; CHECK: movl -{{[0-9]+}}(%rbp), %ecx -; CHECK: vmovaps 80(%rsp), %xmm6 -; CHECK: vmovaps 64(%rsp), %xmm7 -; CHECK: vmovaps 48(%rsp), %xmm8 +; CHECK: vmovaps 64(%rsp), %xmm6 +; CHECK: vmovaps 48(%rsp), %xmm7 +; CHECK: vmovaps 32(%rsp), %xmm8 ; CHECK: leaq .LBB0_1(%rip), %rax ; CHECK: addq $88, %rsp ; CHECK: popq %rbx |
