diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 507320d5757..73945d7ff1a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR rtl-optimization/78952
+	* config/i386/i386.md (any_extract): New code iterator.
+	(*insvqi_2): Use any_extract for source operand.
+	(*insvqi_3): Use any_shiftrt for source operand.
+
 2017-01-18  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* config/aarch64/aarch64.c (aarch64_sched_adjust_priority)
@@ -15,7 +22,7 @@
 
 2017-01-18  Matthias Klose  <doko@ubuntu.com>
 
-       * doc/install.texi: Allow default for --with-target-bdw-gc-include.
+	* doc/install.texi: Allow default for --with-target-bdw-gc-include.
 
 2016-01-18  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
@@ -41,12 +48,6 @@
 	(s390_valid_target_attribute_inner_p): Likewise.
 	* config/s390/s390.md ("tabort"): Likewise.
 
-2017-01-18  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.target/s390/target-attribute/tattr-2.c: Add -fno-ipa-icf
-	to dg-options.
-	(p0): Add missing dg-error.
-
 2017-01-18  Toma Tabacu  <toma.tabacu@imgtec.com>
 
 	* config/mips/mips.h (ISA_HAS_DIV3): Remove unused macro.
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 1d58ceb773a..3af1ffc5dac 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -2960,13 +2960,15 @@
 	   (subreg:SI (match_dup 1) 0))
       (unspec [(const_int 0)] UNSPEC_NOREX_MEM)])])
 
+(define_code_iterator any_extract [sign_extract zero_extract])
+
 (define_insn "*insvqi_2"
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "+Q")
 			 (const_int 8)
 			 (const_int 8))
-	(zero_extract:SI (match_operand 1 "ext_register_operand" "Q")
-			 (const_int 8)
-			 (const_int 8)))]
+	(any_extract:SI (match_operand 1 "ext_register_operand" "Q")
+			(const_int 8)
+			(const_int 8)))]
   ""
   "mov{b}\t{%h1, %h0|%h0, %h1}"
   [(set_attr "type" "imov")
@@ -2976,8 +2978,8 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "+Q")
 			 (const_int 8)
 			 (const_int 8))
-	(lshiftrt:SI (match_operand:SI 1 "register_operand" "Q")
-		     (const_int 8)))]
+	(any_shiftrt:SI (match_operand:SI 1 "register_operand" "Q")
+			(const_int 8)))]
   ""
   "mov{b}\t{%h1, %h0|%h0, %h1}"
   [(set_attr "type" "imov")
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 974f9ffaaaa..538e08effe2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR rtl-optimization/78952
+	* gcc.target/i386/pr78952-1.c: New test.
+	* gcc.target/i386/pr78952-2.c: Ditto.
+
 2017-01-18  Andre Vehreschild  <vehre@gcc.gnu.org>
 
 	* gfortran.dg/coarray_alloc_with_implicit_sync_2.f90: New test.
@@ -46,6 +52,12 @@
 	PR c++/79091
 	* g++.dg/pr79091.C: New.
 
+2017-01-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.target/s390/target-attribute/tattr-2.c: Add -fno-ipa-icf
+	to dg-options.
+	(p0): Add missing dg-error.
+
 2017-01-17  Joe Seymour  <joe.s@somniumtech.com>
 
 	* gcc.target/msp430/mul_f5_muldef.c: New test.
@@ -177,7 +189,7 @@
 2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	Revert:
-        2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>
+	2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/71737
 	* g++.dg/cpp0x/pr71737.C: New.
@@ -198,8 +210,8 @@
 
 2017-01-14  Bernd Schmidt  <bschmidt@redhat.com>
 
-        PR rtl-optimization/78626
-        PR rtl-optimization/78727
+	PR rtl-optimization/78626
+	PR rtl-optimization/78727
 	* gcc.dg/torture/pr78626.c: New test.
 	* gcc.dg/torture/pr78727.c: New test.
 
diff --git a/gcc/testsuite/gcc.target/i386/pr78952-1.c b/gcc/testsuite/gcc.target/i386/pr78952-1.c
new file mode 100644
index 00000000000..2d2746dfa8d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr78952-1.c
@@ -0,0 +1,21 @@
+/* PR target/78952 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -masm=att" } */
+/* { dg-additional-options "-mregparm=3" { target ia32 } } */
+/* { dg-final { scan-assembler-not "movsbl" } } */
+
+struct S1
+{
+  char pad1;
+  char val;
+  short pad2;
+};
+
+struct S1 foo (struct S1 a, struct S1 b)
+{
+  a.val = b.val;
+
+  return a;
+}
+
+/* { dg-final { scan-assembler "\[ \t\]movb\[ \t\]+%.h, %.h" } } */
diff --git a/gcc/testsuite/gcc.target/i386/pr78952-2.c b/gcc/testsuite/gcc.target/i386/pr78952-2.c
new file mode 100644
index 00000000000..18230f140e2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr78952-2.c
@@ -0,0 +1,21 @@
+/* PR target/78952 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -masm=att" } */
+/* { dg-additional-options "-mregparm=3" { target ia32 } } */
+/* { dg-final { scan-assembler-not "sarl" } } */
+
+struct S1
+{
+  char pad1;
+  char val;
+  short pad2;
+};
+
+struct S1 foo (struct S1 a, int b)
+{
+  a.val = b >> 8;
+
+  return a;
+}
+
+/* { dg-final { scan-assembler "\[ \t\]movb\[ \t\]+%.h, %.h" } } */