diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 6d66b063a7d..b55128eac76 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -8591,7 +8591,9 @@
   ""
   "
 {
-  rtx out, addr, eoschar, align, scratch1, scratch2, scratch3;
+  rtx out, addr, scratch1, scratch2, scratch3;
+  rtx eoschar = operands[2];
+  rtx align = operands[3];
 
   /* The generic case of strlen expander is long.  Avoid it's
      expanding unless TARGET_INLINE_ALL_STRINGOPS.  */
@@ -8603,8 +8605,6 @@
 
   out = operands[0];
   addr = force_reg (Pmode, XEXP (operands[1], 0));
-  eoschar = operands[2];
-  align = operands[3];
   scratch1 = gen_reg_rtx (SImode);
 
   if (TARGET_UNROLL_STRLEN && eoschar == const0_rtx && optimize > 1