[llvm] r355136 - [AArch64] [Windows] Don't skip constructing UnwindHelp.
Hans Wennborg via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 4 04:55:36 PST 2019
Merged to release_80 in r355313, except the
test/CodeGen/AArch64/seh-finally.ll diff which didn't apply.
On Thu, Feb 28, 2019 at 9:37 PM Eli Friedman via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: efriedma
> Date: Thu Feb 28 12:38:45 2019
> New Revision: 355136
>
> URL: http://llvm.org/viewvc/llvm-project?rev=355136&view=rev
> Log:
> [AArch64] [Windows] Don't skip constructing UnwindHelp.
>
> In certain cases, the first non-frame-setup instruction in a function is
> a branch. For example, it could be a cbz on an argument. Make sure we
> correctly allocate the UnwindHelp, and find an appropriate register to
> use to initialize it.
>
> Fixes https://bugs.llvm.org/show_bug.cgi?id=40184
>
> Differential Revision: https://reviews.llvm.org/D58752
>
>
> Added:
> llvm/trunk/test/CodeGen/AArch64/wineh-try-catch-cbz.ll
> Modified:
> llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
> llvm/trunk/test/CodeGen/AArch64/seh-finally.ll
> llvm/trunk/test/CodeGen/AArch64/wineh-try-catch.ll
>
> Modified: llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp?rev=355136&r1=355135&r2=355136&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp (original)
> +++ llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp Thu Feb 28 12:38:45 2019
> @@ -2142,9 +2142,6 @@ void AArch64FrameLowering::processFuncti
> while (MBBI != MBB.end() && MBBI->getFlag(MachineInstr::FrameSetup))
> ++MBBI;
>
> - if (MBBI->isTerminator())
> - return;
> -
> // Create an UnwindHelp object.
> int UnwindHelpFI =
> MFI.CreateStackObject(/*size*/8, /*alignment*/16, false);
> @@ -2152,8 +2149,10 @@ void AArch64FrameLowering::processFuncti
> // We need to store -2 into the UnwindHelp object at the start of the
> // function.
> DebugLoc DL;
> - RS->enterBasicBlock(MBB);
> - unsigned DstReg = RS->scavengeRegister(&AArch64::GPR64RegClass, MBBI, 0);
> + RS->enterBasicBlockEnd(MBB);
> + RS->backward(std::prev(MBBI));
> + unsigned DstReg = RS->FindUnusedReg(&AArch64::GPR64commonRegClass);
> + assert(DstReg && "There must be a free register after frame setup");
> BuildMI(MBB, MBBI, DL, TII.get(AArch64::MOVi64imm), DstReg).addImm(-2);
> BuildMI(MBB, MBBI, DL, TII.get(AArch64::STURXi))
> .addReg(DstReg, getKillRegState(true))
>
> Modified: llvm/trunk/test/CodeGen/AArch64/seh-finally.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/seh-finally.ll?rev=355136&r1=355135&r2=355136&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AArch64/seh-finally.ll (original)
> +++ llvm/trunk/test/CodeGen/AArch64/seh-finally.ll Thu Feb 28 12:38:45 2019
> @@ -36,8 +36,8 @@ define void @simple_seh() #0 personality
> entry:
> ; CHECK-LABEL: simple_seh
> ; CHECK: add x29, sp, #16
> -; CHECK: orr x1, xzr, #0xfffffffffffffffe
> -; CHECK: stur x1, [x29, #-16]
> +; CHECK: orr x0, xzr, #0xfffffffffffffffe
> +; CHECK: stur x0, [x29, #-16]
> ; CHECK: .set .Lsimple_seh$frame_escape_0, -8
> ; CHECK: ldur w0, [x29, #-8]
> ; CHECK: bl foo
> @@ -90,8 +90,8 @@ entry:
> ; CHECK: sub x9, sp, #64
> ; CHECK: and sp, x9, #0xffffffffffffffe0
> ; CHECK: mov x19, sp
> -; CHECK: orr x1, xzr, #0xfffffffffffffffe
> -; CHECK: stur x1, [x19, #16]
> +; CHECK: orr x0, xzr, #0xfffffffffffffffe
> +; CHECK: stur x0, [x19, #16]
> ; CHECK: .set .Lstack_realign$frame_escape_0, 32
> ; CHECK: ldr w0, [x19, #32]
> ; CHECK: bl foo
>
> Added: llvm/trunk/test/CodeGen/AArch64/wineh-try-catch-cbz.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/wineh-try-catch-cbz.ll?rev=355136&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AArch64/wineh-try-catch-cbz.ll (added)
> +++ llvm/trunk/test/CodeGen/AArch64/wineh-try-catch-cbz.ll Thu Feb 28 12:38:45 2019
> @@ -0,0 +1,40 @@
> +; RUN: llc < %s | FileCheck %s
> +
> +; Make sure the prologue is sane. (Doesn't need to exactly match this,
> +; but the original issue only reproduced if the cbz was immediately
> +; after the frame setup.)
> +
> +; CHECK: sub sp, sp, #32
> +; CHECK-NEXT: stp x29, x30, [sp, #16]
> +; CHECK-NEXT: add x29, sp, #16
> +; CHECK-NEXT: orr x1, xzr, #0xfffffffffffffffe
> +; CHECK-NEXT: stur x1, [x29, #-16]
> +; CHECK-NEXT: cbz w0, .LBB0_2
> +
> +target datalayout = "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128"
> +target triple = "aarch64-unknown-windows-msvc19.11.0"
> +
> +; Function Attrs: uwtable
> +define dso_local void @"?f@@YAXH at Z"(i32 %x) local_unnamed_addr #0 personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*) {
> +entry:
> + %cmp = icmp eq i32 %x, 0
> + br i1 %cmp, label %try.cont, label %if.then
> +
> +if.then: ; preds = %entry
> + invoke void @"?g@@YAXXZ"()
> + to label %try.cont unwind label %catch.dispatch
> +
> +catch.dispatch: ; preds = %if.then
> + %0 = catchswitch within none [label %catch] unwind to caller
> +
> +catch: ; preds = %catch.dispatch
> + %1 = catchpad within %0 [i8* null, i32 64, i8* null]
> + catchret from %1 to label %try.cont
> +
> +try.cont: ; preds = %entry, %if.then, %catch
> + ret void
> +}
> +
> +declare dso_local void @"?g@@YAXXZ"() local_unnamed_addr #1
> +
> +declare dso_local i32 @__CxxFrameHandler3(...)
>
> Modified: llvm/trunk/test/CodeGen/AArch64/wineh-try-catch.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/wineh-try-catch.ll?rev=355136&r1=355135&r2=355136&view=diff
> ==============================================================================
> --- llvm/trunk/test/CodeGen/AArch64/wineh-try-catch.ll (original)
> +++ llvm/trunk/test/CodeGen/AArch64/wineh-try-catch.ll Thu Feb 28 12:38:45 2019
> @@ -22,8 +22,8 @@
> ; CHECK: add x29, sp, #32
> ; CHECK: sub sp, sp, #624
> ; CHECK: mov x19, sp
> -; CHECK: orr x1, xzr, #0xfffffffffffffffe
> -; CHECK: stur x1, [x19]
> +; CHECK: orr x0, xzr, #0xfffffffffffffffe
> +; CHECK: stur x0, [x19]
>
> ; Now check that x is stored at fp - 20. We check that this is the same
> ; location accessed from the funclet to retrieve x.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list