[llvm] r262756 - Fix build breakage

[David Majnemer via llvm-commits]

Author: majnemer
Date: Fri Mar  4 17:02:15 2016
New Revision: 262756

URL: http://llvm.org/viewvc/llvm-project?rev=262756&view=rev
Log:
Fix build breakage

Modified:
    llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp

Modified: llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp?rev=262756&r1=262755&r2=262756&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp Fri Mar  4 17:02:15 2016
@@ -164,13 +164,14 @@ bool X86ExpandPseudo::ExpandMI(MachineBa
                     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));