diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 613d0983ad6..31289464577 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -911,6 +911,14 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT,
     if (N2.getOpcode() == ISD::FNEG)          // (A- (-B) -> A+B
       return getNode(ISD::ADD, VT, N1, N2.getOperand(0));
     break;
+  case ISD::SHL:
+  case ISD::SRL:
+  case ISD::SRA:
+    if (N2.getOpcode() == ISD::ZERO_EXTEND_INREG || 
+        N2.getOpcode() == ISD::SIGN_EXTEND_INREG) {
+      return getNode(Opcode, VT, N1, N2.getOperand(0));
+    }
+    break;
   }
 
   SDNode *&N = BinaryOps[std::make_pair(Opcode, std::make_pair(N1, N2))];
@@ -1002,6 +1010,14 @@ SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT,
       else
         return N1;         // Never-taken branch
     break;
+  case ISD::SRA_PARTS:
+  case ISD::SRL_PARTS:
+  case ISD::SHL_PARTS:
+    if (N3.getOpcode() == ISD::ZERO_EXTEND_INREG || 
+        N3.getOpcode() == ISD::SIGN_EXTEND_INREG) {
+      return getNode(Opcode, VT, N1, N2, N3.getOperand(0));
+    }
+    break;
   }
 
   SDNode *N = new SDNode(Opcode, N1, N2, N3);