Index: lib/CodeGen/SelectionDAG/SelectionDAG.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -2188,20 +2188,22 @@
     }
     break;
   case ISD::UREM: {
+    bool IsConstPowerOf2 = false;
     if (ConstantSDNode *Rem = dyn_cast<ConstantSDNode>(Op.getOperand(1))) {
       const APInt &RA = Rem->getAPIntValue();
       if (RA.isPowerOf2()) {
         APInt LowBits = (RA - 1);
         KnownZero |= ~LowBits;
-        computeKnownBits(Op.getOperand(0), KnownZero, KnownOne,Depth+1);
-        break;
+        computeKnownBits(Op.getOperand(0), KnownZero2, KnownOne2,Depth+1);
+        IsConstPowerOf2 = true;
       }
     }
-
-    // Since the result is less than or equal to either operand, any leading
-    // zero bits in either operand must also exist in the result.
-    computeKnownBits(Op.getOperand(0), KnownZero, KnownOne, Depth+1);
-    computeKnownBits(Op.getOperand(1), KnownZero2, KnownOne2, Depth+1);
+    if (!IsConstPowerOf2) {
+      // Since the result is less than or equal to either operand, any leading
+      // zero bits in either operand must also exist in the result.
+      computeKnownBits(Op.getOperand(0), KnownZero, KnownOne, Depth+1);
+      computeKnownBits(Op.getOperand(1), KnownZero2, KnownOne2, Depth+1);
+    }
 
     uint32_t Leaders = std::max(KnownZero.countLeadingOnes(),
                                 KnownZero2.countLeadingOnes());