From: Mattias Engdegård <mattiase@acm.org>
Date: Thu, 17 Mar 2022 14:08:24 +0000 (+0100)
Subject: Fix over-zealous assertions
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43a339fe10df3952a5f1749403d7b8148554008a;p=emacs.git

Fix over-zealous assertions

* src/sort.c (gallop_left, gallop_right): Don't test Lisp values for
being nonzero; it only made sense when `key` was a pointer that had to
be non-null.
---

diff --git a/src/sort.c b/src/sort.c
index 24469ef99dc..3f7a2909ad7 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -223,7 +223,7 @@ gallop_left (merge_state *ms, const Lisp_Object key, Lisp_Object *a,
 {
   Lisp_Object pred = ms->predicate;
 
-  eassume (key && a && n > 0 && hint >= 0 && hint < n);
+  eassume (a && n > 0 && hint >= 0 && hint < n);
 
   a += hint;
   ptrdiff_t lastofs = 0;
@@ -306,7 +306,7 @@ gallop_right (merge_state *ms, const Lisp_Object key, Lisp_Object *a,
 {
   Lisp_Object pred = ms->predicate;
 
-  eassume (key && a && n > 0 && hint >= 0 && hint < n);
+  eassume (a && n > 0 && hint >= 0 && hint < n);
 
   a += hint;
   ptrdiff_t lastofs = 0;