diff --git a/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
index 0ac0ca27acf..ecc9fc3e456 100644
--- a/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ b/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -525,31 +525,32 @@ Instruction *InstCombiner::visitFMul(BinaryOperator &I) {
     }
 
     // B * (uitofp i1 C) -> select C, B, 0
-    if(I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
-        Value *LHS=Op0, *RHS=Op1;
-        Value *B, *C;
-        if (!match(RHS, m_UIToFp(m_Value(C))))
-            std::swap(LHS, RHS);
+    if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
+      Value *LHS = Op0, *RHS = Op1;
+      Value *B, *C;
+      if (!match(RHS, m_UIToFp(m_Value(C))))
+        std::swap(LHS, RHS);
 
-        if (match(RHS, m_UIToFp(m_Value(C)))) {
-            B=LHS;
-            Value *Zero = ConstantFP::getNegativeZero(B->getType());
-            return SelectInst::Create(C, B, Zero);
-        }
+      if (match(RHS, m_UIToFp(m_Value(C))) && C->getType()->isIntegerTy(1)) {
+        B = LHS;
+        Value *Zero = ConstantFP::getNegativeZero(B->getType());
+        return SelectInst::Create(C, B, Zero);
+      }
     }
 
     // A * (1 - uitofp i1 C) -> select C, 0, A
-    if(I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) { 
-        Value *LHS=Op0, *RHS=Op1;
-        Value *A, *C;
-        if (!match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))))
-            std::swap(LHS, RHS);
+    if (I.hasNoNaNs() && I.hasNoInfs() && I.hasNoSignedZeros()) {
+      Value *LHS = Op0, *RHS = Op1;
+      Value *A, *C;
+      if (!match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))))
+        std::swap(LHS, RHS);
 
-        if (match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C))))) {
-            A=LHS;
-            Value *Zero = ConstantFP::getNegativeZero(A->getType());
-            return SelectInst::Create(C, Zero, A);
-        }
+      if (match(RHS, m_FSub(m_FPOne(), m_UIToFp(m_Value(C)))) &&
+          C->getType()->isIntegerTy(1)) {
+        A = LHS;
+        Value *Zero = ConstantFP::getNegativeZero(A->getType());
+        return SelectInst::Create(C, Zero, A);
+      }
     }
 
     if (!isa<Constant>(Op1))
diff --git a/test/Transforms/InstCombine/add4.ll b/test/Transforms/InstCombine/add4.ll
index 3b19e9ef103..0fc0a6c1ac2 100644
--- a/test/Transforms/InstCombine/add4.ll
+++ b/test/Transforms/InstCombine/add4.ll
@@ -38,3 +38,21 @@ EntryBlock:
 ; CHECK: select i1 %C, float %B, float %A
 }
 
+; PR15952
+define float @test4(float %A, float %B, i32 %C) {
+  %cf = uitofp i32 %C to float
+  %mc = fsub float 1.000000e+00, %cf
+  %p1 = fmul fast float %A, %mc
+  ret float %p1
+; CHECK: @test4
+; CHECK: uitofp
+}
+
+define float @test5(float %A, float %B, i32 %C) {
+  %cf = uitofp i32 %C to float
+  %p2 = fmul fast float %B, %cf
+  ret float %p2
+; CHECK: @test5
+; CHECK: uitofp
+}
+