From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 13 Jul 2011 00:23:39 +0000 (+0000)
Subject: Assign variable before we test it.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3641e811729fc7f21039af595d62bc8e696ff407;p=oota-llvm.git

Assign variable before we test it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135015 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp
index d30ecef0cd3..136a7e1d19b 100644
--- a/lib/Target/X86/X86FrameLowering.cpp
+++ b/lib/Target/X86/X86FrameLowering.cpp
@@ -1073,13 +1073,12 @@ getCompactUnwindEncoding(ArrayRef<MCCFIInstruction> Instrs,
     if (Src.isReg() && Src.getReg() == MachineLocation::VirtualFP) {
       // DW_CFA_def_cfa_register
       assert(FramePointerReg == -1 && "Defining more than one frame pointer?");
+      FramePointerReg = Dst.getReg();
       if (TRI->getLLVMRegNum(FramePointerReg, IsEH) != X86::EBP &&
           TRI->getLLVMRegNum(FramePointerReg, IsEH) != X86::RBP)
         // The frame pointer isn't EBP/RBP. Cannot make unwind information
         // compact.
         return 0;
-
-      FramePointerReg = Dst.getReg();
       continue;
     }