Fix bitwidth mismatch

Change-Id: I31eb218cdc295ccf5b2749b89945c95aed34d07f

Author: jrbyrnes

llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp

@@ -3661,7 +3661,10 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
 
       if (LHSDecompose && RHSDecompose && LHSDecompose->X == RHSDecompose->X &&
           RHSDecompose->Mask.isPowerOf2() && LHSDecompose->Mask.isPowerOf2() &&
-          LHSDecompose->Mask != RHSDecompose->Mask) {
+          LHSDecompose->Mask != RHSDecompose->Mask &&
+          LHSDecompose->Mask.getBitWidth() == Op0Ne->getBitWidth() &&
+          RHSDecompose->Mask.getBitWidth() == Op1Ne->getBitWidth()) {
+        assert(Op0Ne->getBitWidth() == Op1Ne->getBitWidth());
         assert(ICmpInst::isEquality(LHSDecompose->Pred));
         if (LHSDecompose->Pred == ICmpInst::ICMP_NE)
           std::swap(Op0Eq, Op0Ne);

llvm/test/Transforms/InstCombine/or-bitmask.ll

@@ -323,6 +323,44 @@ define <2 x i32> @add_select_cmp_vec_nonunique(<2 x i32> %in) {
   %out = or disjoint <2 x i32> %sel0, %sel1
   ret <2 x i32> %out
 }
+
+define i64 @mask_select_types(i32 %in) {
+; CHECK-LABEL: @mask_select_types(
+; CHECK-NEXT:    [[BITOP0:%.*]] = and i32 [[IN:%.*]], 1
+; CHECK-NEXT:    [[CMP0_NOT:%.*]] = icmp eq i32 [[BITOP0]], 0
+; CHECK-NEXT:    [[BITOP1:%.*]] = and i32 [[IN]], 2
+; CHECK-NEXT:    [[CMP1_NOT:%.*]] = icmp eq i32 [[BITOP1]], 0
+; CHECK-NEXT:    [[SEL0:%.*]] = select i1 [[CMP0_NOT]], i64 0, i64 72
+; CHECK-NEXT:    [[SEL1:%.*]] = select i1 [[CMP1_NOT]], i64 0, i64 144
+; CHECK-NEXT:    [[OUT:%.*]] = or disjoint i64 [[SEL0]], [[SEL1]]
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+  %bitop0 = and i32 %in, 1
+  %cmp0 = icmp ne i32 %bitop0, 0
+  %bitop1 = and i32 %in, 2
+  %cmp1 = icmp ne i32 %bitop1, 0
+  %sel0 = select i1 %cmp0, i64 72, i64 0
+  %sel1 = select i1 %cmp1, i64 144, i64 0
+  %out = or disjoint i64 %sel0, %sel1
+  ret i64 %out
+}
+
+define i64 @mask_select_types_1(i64 %in) {
+; CHECK-LABEL: @mask_select_types_1(
+; CHECK-NEXT:    [[TMP1:%.*]] = and i64 [[IN:%.*]], 3
+; CHECK-NEXT:    [[OUT:%.*]] = mul nuw nsw i64 [[TMP1]], 72
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+  %bitop0 = and i64 %in, 1
+  %cmp0 = icmp ne i64 %bitop0, 0
+  %bitop1 = and i64 %in, 2
+  %cmp1 = icmp ne i64 %bitop1, 0
+  %sel0 = select i1 %cmp0, i64 72, i64 0
+  %sel1 = select i1 %cmp1, i64 144, i64 0
+  %out = or disjoint i64 %sel0, %sel1
+  ret i64 %out
+}
+
 ;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
 ; CONSTSPLAT: {{.*}}
 ; CONSTVEC: {{.*}}