[Emacs-diffs] master f9744a5: Pacify x86 GCC 9 in tab bar code

[Paul Eggert]

branch: master
commit f9744a5f09fe3d786de8dfb264598bf4d77ece8c
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Pacify x86 GCC 9 in tab bar code
    
    * src/xdisp.c (tty_get_tab_bar_item): Simplify a bit.  This
    pacifies --enable-gcc-warnings with x86 GCC 9.2.1 20190827
    (Red Hat 9.2.1-1) when combined with -fsanitize=undefined.
---
 src/xdisp.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 457fa43..0d8f9a1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13419,26 +13419,22 @@ static Lisp_Object
 tty_get_tab_bar_item (struct frame *f, int x, int *idx, ptrdiff_t *end)
 {
   ptrdiff_t clen = 0;
-  Lisp_Object caption;
 
-  int i, j;
-  for (i = 0, j = 0; i < f->n_tab_bar_items; i++, j += TAB_BAR_ITEM_NSLOTS)
+  for (int i = 0; i < f->n_tab_bar_items; i++)
     {
-      caption = AREF (f->tab_bar_items, j + TAB_BAR_ITEM_CAPTION);
+      Lisp_Object caption = AREF (f->tab_bar_items, (i * TAB_BAR_ITEM_NSLOTS
+                                                    + TAB_BAR_ITEM_CAPTION));
       if (NILP (caption))
        return Qnil;
       clen += SCHARS (caption);
       if (x < clen)
-       break;
-    }
-  if (i < f->n_tab_bar_items)
-    {
-      *idx = i;
-      *end = clen;
-      return caption;
+       {
+         *idx = i;
+         *end = clen;
+         return caption;
+       }
     }
-  else
-    return Qnil;
+  return Qnil;
 }
 
 /* Handle a mouse click at X/Y on the tab bar of TTY frame F.  If the