From: David Majnemer <david.majnemer@gmail.com>
Date: Fri, 4 Mar 2016 23:02:15 +0000 (+0000)
Subject: Fix build breakage
X-Git-Tag: llvmorg-3.9.0-rc1~12432
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71a1c2c619120aac716645e6025b0d34120f038d;p=platform%2Fupstream%2Fllvm.git

Fix build breakage

llvm-svn: 262756
---

diff --git a/llvm/lib/Target/X86/X86ExpandPseudo.cpp b/llvm/lib/Target/X86/X86ExpandPseudo.cpp
index 6093c33..2af2be6 100644
--- a/llvm/lib/Target/X86/X86ExpandPseudo.cpp
+++ b/llvm/lib/Target/X86/X86ExpandPseudo.cpp
@@ -164,13 +164,14 @@ bool X86ExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
                     TII->get(STI->is64Bit() ? X86::RETIQ : X86::RETIL))
                 .addImm(StackAdj);
     } else {
-      assert(!Is64Bit && "shouldn't need to do this for x86_64 targets!");
+      assert(!STI->is64Bit() &&
+             "shouldn't need to do this for x86_64 targets!");
       // A ret can only handle immediates as big as 2**16-1.  If we need to pop
       // off bytes before the return address, we must do it manually.
-      BuildMI(MBB, MBBI, DL, X86::POP32r).addReg(X86::ECX, RegState::Define);
+      BuildMI(MBB, MBBI, DL, TII->get(X86::POP32r)).addReg(X86::ECX, RegState::Define);
       X86FL->emitSPUpdate(MBB, MBBI, StackAdj, /*InEpilogue=*/true);
-      BuildMI(MBB, MBBI, DL, X86::PUSH32r).addReg(X86::ECX);
-      MIB = BuildMI(MBB, MBBI, DL, X86::RETL);
+      BuildMI(MBB, MBBI, DL, TII->get(X86::PUSH32r)).addReg(X86::ECX);
+      MIB = BuildMI(MBB, MBBI, DL, TII->get(X86::RETL));
     }
     for (unsigned I = 1, E = MBBI->getNumOperands(); I != E; ++I)
       MIB.addOperand(MBBI->getOperand(I));