[llvm] r351472 - Fix the buildbot failure introduced by r351404

[Sanjin Sijaric via llvm-commits]

Author: ssijaric
Date: Thu Jan 17 12:24:14 2019
New Revision: 351472

URL: http://llvm.org/viewvc/llvm-project?rev=351472&view=rev
Log:
Fix the buildbot failure introduced by r351404

EXPENSIVE_CHECKS buildbots are failing due to r351404.

Add x1 as live in to the funclet basic block for SEH funclets, as well as
-verify-machineinstrs to the test case that triggered the failure.

Modified:
    llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
    llvm/trunk/test/CodeGen/AArch64/seh_funclet_x1.ll

Modified: llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp?rev=351472&r1=351471&r2=351472&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AArch64FrameLowering.cpp Thu Jan 17 12:24:14 2019
@@ -929,9 +929,11 @@ void AArch64FrameLowering::emitPrologue(
     // directly, and is not retrieved from X1.
     if (F.hasPersonalityFn()) {
       EHPersonality Per = classifyEHPersonality(F.getPersonalityFn());
-      if (isAsynchronousEHPersonality(Per))
+      if (isAsynchronousEHPersonality(Per)) {
         BuildMI(MBB, MBBI, DL, TII->get(TargetOpcode::COPY), AArch64::FP)
             .addReg(AArch64::X1).setMIFlag(MachineInstr::FrameSetup);
+        MBB.addLiveIn(AArch64::X1);
+      }
     }
 
     return;

Modified: llvm/trunk/test/CodeGen/AArch64/seh_funclet_x1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/seh_funclet_x1.ll?rev=351472&r1=351471&r2=351472&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AArch64/seh_funclet_x1.ll (original)
+++ llvm/trunk/test/CodeGen/AArch64/seh_funclet_x1.ll Thu Jan 17 12:24:14 2019
@@ -1,4 +1,4 @@
-; RUN: llc -o - %s -mtriple=aarch64-windows | FileCheck %s
+; RUN: llc -o - %s -verify-machineinstrs -mtriple=aarch64-windows | FileCheck %s
 
 ; Windows runtime passes the establisher frame as the second argument to the
 ; termination handler.  Check that we copy it into fp.