[binutils-gdb] x86: drop found_cpu_match local variable

[Jan Beulich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=45a4bb2010a42637bec03c06d84a998afacefb4e

commit 45a4bb2010a42637bec03c06d84a998afacefb4e
Author: Jan Beulich <jbeulich@suse.com>
Date:   Thu Jan 16 10:07:36 2020 +0100

    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:
---
 gas/ChangeLog        |  5 +++++
 gas/config/tc-i386.c | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ff04223..37bf1ac 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 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,
 	testsuite/gas/i386/avx512dq-inval.s: New.
 	* testsuite/gas/i386/i386.exp: Run new test.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 2c087e4..3f7f422 100644
--- 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))