Fix the testb optimization so x86 also bootstraps.
Reenable test.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@59101 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
index e125ff3..62a6df3 100644
--- a/lib/CodeGen/SelectionDAG/TargetLowering.cpp
+++ b/lib/CodeGen/SelectionDAG/TargetLowering.cpp
@@ -1353,7 +1353,6 @@
         }
       }
 
-#if 0
       // If the LHS is '(and load, const)', the RHS is 0,
       // the test is for equality or unsigned, and all 1 bits of the const are
       // in the same partial word, see if we can shorten the load.
@@ -1380,7 +1379,7 @@
                   bestOffset = (origWidth/width - offset - 1) * (width/8);
                 else
                   bestOffset = (uint64_t)offset * (width/8);
-                bestMask = Mask >> (offset * 8);
+                bestMask = Mask >> (offset * (width/8) * 8);
                 bestWidth = width;
                 break;
               }
@@ -1407,7 +1406,6 @@
           }
         }
       }
-#endif
 
       // If the LHS is a ZERO_EXTEND, perform the comparison on the input.
       if (N0.getOpcode() == ISD::ZERO_EXTEND) {