diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1caa076..e6ec3cd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-19  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/64910
+	* config/i386/i386.md (testqi_ext_3): Allow HImode.
+
 2015-12-18  Jeff Law  <law@redhat.com>
 
 	PR rtl-optimization/49847
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 49b2216..e8178f3 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -7868,7 +7868,7 @@
 ;; Combine likes to form bit extractions for some tests.  Humor it.
 (define_insn "*testqi_ext_3"
   [(set (reg FLAGS_REG)
-	(compare (zero_extract:SWI48
+	(compare (zero_extract:SWI248
 		   (match_operand 0 "nonimmediate_operand" "rm")
 		   (match_operand 1 "const_int_operand" "n")
 		   (match_operand 2 "const_int_operand" "n"))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 57326d1..143c73c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-19  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/64910
+	* gcc.target/i386/bittest.c: New test.
+
 2015-12-18  Jeff Law  <law@redhat.com>
 
 	PR rtl-optimization/49847
diff --git a/gcc/testsuite/gcc.target/i386/bittest.c b/gcc/testsuite/gcc.target/i386/bittest.c
new file mode 100644
index 0000000..7b7ce9e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/bittest.c
@@ -0,0 +1,22 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+extern int dbg_cnt (void);
+
+struct function
+{
+  unsigned int calls_setjmp:1;
+};
+extern struct function *cfun;
+unsigned char
+gate_rtl_cprop (void)
+{
+  return !(cfun + 0)->calls_setjmp && dbg_cnt ();
+}
+
+/* This should be implementable without performing a bitmask as we can
+   just use a test imm,mem.  So instructions which load the object from
+   memory and mask off bits are unnecessary.  In theory we can just count
+   the move-with-extension, and and testb instructions.  There should be
+   only one.  */
+/* { dg-final { scan-assembler-times "movzbl|and|testb" 1 { target { i?86-*-* x86_64-*-*} } } } */