x86: drop found_cpu_match local variable

50aecf8c5f could have done so right away; perhaps the variable shouldn't
have been introduced in the first place.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ff04223e0ec3da23a2ec6296e5d640e97bdd866a..37bf1ac7e75f26ee27b639a89ad5fdc5831b54ad 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-16  Jan Beulich  <jbeulich@suse.com>
+
+       * config/tc-i386.c (match_template): Drop found_cpu_match local
+       variable.
+
 2020-01-16  Jan Beulich  <jbeulich@suse.com>
 
        * testsuite/gas/i386/avx512dq-inval.l,

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 2c087e42e0de4486ce1b89d6c2d1b1d36ded1a9e..3f7f4222bf5f5879e125b72658263624efc83b0c 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -5745,9 +5745,7 @@ match_template (char mnem_suffix)
   i386_opcode_modifier suffix_check;
   i386_operand_type operand_types [MAX_OPERANDS];
   int addr_prefix_disp;
-  unsigned int j;
-  unsigned int found_cpu_match, size_match;
-  unsigned int check_register;
+  unsigned int j, size_match, check_register;
   enum i386_error specific_error = 0;
 
 #if MAX_OPERANDS != 5
@@ -5799,9 +5797,7 @@ match_template (char mnem_suffix)
 
       /* Check processor support.  */
       i.error = unsupported;
-      found_cpu_match = (cpu_flags_match (t)
-                        == CPU_FLAGS_PERFECT_MATCH);
-      if (!found_cpu_match)
+      if (cpu_flags_match (t) != CPU_FLAGS_PERFECT_MATCH)
        continue;
 
       /* Check AT&T mnemonic.   */
@@ -6124,8 +6120,6 @@ check_reverse:
          /* Found either forward/reverse 2, 3 or 4 operand match here:
             slip through to break.  */
        }
-      if (!found_cpu_match)
-       continue;
 
       /* Check if vector and VEX operands are valid.  */
       if (check_VecOperands (t) || VEX_check_operands (t))