1 files changed, 12 insertions, 10 deletions
diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp
index e414e19656..71504f94d0 100644
--- a/lib/Target/X86/X86InstrInfo.cpp
+++ b/lib/Target/X86/X86InstrInfo.cpp
@@ -13,13 +13,16 @@
 
 #include "X86InstrInfo.h"
 #include "X86.h"
+#include "X86GenInstrInfo.inc"
 #include "X86InstrBuilder.h"
+#include "X86Subtarget.h"
+#include "X86TargetMachine.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "X86GenInstrInfo.inc"
 using namespace llvm;
 
-X86InstrInfo::X86InstrInfo()
-  : TargetInstrInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0])) {
+X86InstrInfo::X86InstrInfo(X86TargetMachine &tm)
+  : TargetInstrInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0])),
+    TM(tm) {
 }
 
 
@@ -122,13 +125,12 @@ MachineInstr *X86InstrInfo::convertToThreeAddress(MachineInstr *MI) const {
   case X86::SHUFPSrri: {
     assert(MI->getNumOperands() == 4 && "Unknown shufps instruction!");
     const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
-    if (Subtarget->hasSSE2()) {
-      unsigned A = MI->getOperand(0).getReg();
-      unsigned B = MI->getOperand(1).getReg();
-      unsigned C = MI->getOperand(2).getReg();
-      unsigned M = MI->getOperand(3).getImmedValue();
-      return BuildMI(X86::PSHUFDri, 2, A).addReg(B).addImm(M);
-    }
+    if (!Subtarget->hasSSE2()) return 0;
+    unsigned A = MI->getOperand(0).getReg();
+    unsigned B = MI->getOperand(1).getReg();
+    unsigned C = MI->getOperand(2).getReg();
+    unsigned M = MI->getOperand(3).getImmedValue();
+    return BuildMI(X86::PSHUFDri, 2, A).addReg(B).addImm(M);
   }
   }