From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 14 Dec 2022 09:07:44 +0000 (+0100)
Subject: x86: adjust type checking constructs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb99386180bb187f3ef3a59b222f16c8dfe3b81e;p=binutils-gdb.git

x86: adjust type checking constructs

As Alan points out, ASAN takes issue with these constructs, for
current_templates being NULL. Wrap them in sizeof(), so the expressions
aren't actually evaluated.
---

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index ffe97d9d10e..990f4b9fec2 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -2985,8 +2985,8 @@ md_begin (void)
 
     /* Type checks to compensate for the conversion through void * which
        occurs during hash table insertion / lookup.  */
-    (void)(sets == &current_templates->start);
-    (void)(end == &current_templates->end);
+    (void) sizeof (sets == &current_templates->start);
+    (void) sizeof (end == &current_templates->end);
     for (; sets < end; ++sets)
       if (str_hash_insert (op_hash, (*sets)->name, sets, 0))
 	as_fatal (_("duplicate %s"), (*sets)->name);