Index: lib/Transforms/InstCombine/InstCombineCompares.cpp
===================================================================
--- lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -4506,6 +4506,16 @@
         return New;
   }
 
+  // Zero-equality checks are preserved through unsigned floating-point casts:
+  // icmp eq (bitcast (uitofp X)), 0 --> icmp eq X, 0
+  // icmp ne (bitcast (uitofp X)), 0 --> icmp ne X, 0
+  Value *X;
+  if (match(Op0, m_BitCast(m_UIToFP(m_Value(X))))) {
+    if ((Pred == ICmpInst::ICMP_EQ || Pred == ICmpInst::ICMP_NE) &&
+        match(Op1, m_Zero()))
+      return new ICmpInst(Pred, X, ConstantInt::getNullValue(X->getType()));
+  }
+
   // Test to see if the operands of the icmp are casted versions of other
   // values.  If the ptr->ptr cast can be stripped off both arguments, we do so
   // now.
Index: test/Transforms/InstCombine/cast-unsigned-icmp-eqcmp-0.ll
===================================================================
--- test/Transforms/InstCombine/cast-unsigned-icmp-eqcmp-0.ll
+++ test/Transforms/InstCombine/cast-unsigned-icmp-eqcmp-0.ll
@@ -8,11 +8,11 @@
 ; FIXME: *all* of these are true tests.
 ; In *all* of these, uitofp and bitcast should be instcombine'd out.
 
+; FIXME: vector cases are not handled. The matchers should look through undef.
+
 define i1 @i32_cast_cmp_eq_int_0_uitofp_float(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_eq_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to float
@@ -36,9 +36,7 @@
 
 define i1 @i32_cast_cmp_ne_int_0_uitofp_float(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_ne_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to float
@@ -62,9 +60,7 @@
 
 define i1 @i32_cast_cmp_eq_int_0_uitofp_double(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_eq_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to double
@@ -88,9 +84,7 @@
 
 define i1 @i32_cast_cmp_ne_int_0_uitofp_double(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_ne_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to double
@@ -114,9 +108,7 @@
 
 define i1 @i32_cast_cmp_eq_int_0_uitofp_half(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_eq_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to half
@@ -140,9 +132,7 @@
 
 define i1 @i32_cast_cmp_ne_int_0_uitofp_half(i32 %i) {
 ; CHECK-LABEL: @i32_cast_cmp_ne_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i32 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i32 %i to half
@@ -166,9 +156,7 @@
 
 define i1 @i64_cast_cmp_eq_int_0_uitofp_float(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_eq_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to float
@@ -192,9 +180,7 @@
 
 define i1 @i64_cast_cmp_ne_int_0_uitofp_float(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_ne_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to float
@@ -218,9 +204,7 @@
 
 define i1 @i64_cast_cmp_eq_int_0_uitofp_double(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_eq_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to double
@@ -244,9 +228,7 @@
 
 define i1 @i64_cast_cmp_ne_int_0_uitofp_double(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_ne_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to double
@@ -270,9 +252,7 @@
 
 define i1 @i64_cast_cmp_eq_int_0_uitofp_half(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_eq_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to half
@@ -296,9 +276,7 @@
 
 define i1 @i64_cast_cmp_ne_int_0_uitofp_half(i64 %i) {
 ; CHECK-LABEL: @i64_cast_cmp_ne_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i64 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i64 %i to half
@@ -322,9 +300,7 @@
 
 define i1 @i16_cast_cmp_eq_int_0_uitofp_float(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_eq_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to float
@@ -348,9 +324,7 @@
 
 define i1 @i16_cast_cmp_ne_int_0_uitofp_float(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_ne_int_0_uitofp_float(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to float
-; CHECK-NEXT:    [[B:%.*]] = bitcast float [[F]] to i32
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i32 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to float
@@ -374,9 +348,7 @@
 
 define i1 @i16_cast_cmp_eq_int_0_uitofp_double(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_eq_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to double
@@ -400,9 +372,7 @@
 
 define i1 @i16_cast_cmp_ne_int_0_uitofp_double(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_ne_int_0_uitofp_double(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to double
-; CHECK-NEXT:    [[B:%.*]] = bitcast double [[F]] to i64
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to double
@@ -426,9 +396,7 @@
 
 define i1 @i16_cast_cmp_eq_int_0_uitofp_half(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_eq_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to half
@@ -452,9 +420,7 @@
 
 define i1 @i16_cast_cmp_ne_int_0_uitofp_half(i16 %i) {
 ; CHECK-LABEL: @i16_cast_cmp_ne_int_0_uitofp_half(
-; CHECK-NEXT:    [[F:%.*]] = uitofp i16 [[I:%.*]] to half
-; CHECK-NEXT:    [[B:%.*]] = bitcast half [[F]] to i16
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[B]], 0
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i16 [[I:%.*]], 0
 ; CHECK-NEXT:    ret i1 [[CMP]]
 ;
   %f = uitofp i16 %i to half