* lisp/emacs-lisp/comp-cstr.el (comp-cstr-fixnum-p): Fix.

(cherry picked from commit 219b98916bc498bf15bbef6577af648834d4727d)

diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index 6509def76a2f951f87dd91578a7854fbb2a506ab..65240550f6b03850e69c03bb16d288a6322333d3 100644 (file)
--- a/lisp/emacs-lisp/comp-cstr.el
+++ b/lisp/emacs-lisp/comp-cstr.el
@@ -911,7 +911,9 @@ Non memoized version of `comp-cstr-intersection-no-mem'."
 (defun comp-cstr-fixnum-p (cstr)
   "Return t if CSTR is certainly a fixnum."
   (with-comp-cstr-accessors
-    (when (null (neg cstr))
+    (when (and (null (neg cstr))
+               (null (valset cstr))
+               (null (typeset cstr)))
       (when-let (range (range cstr))
         (let* ((low (caar range))
                (high (cdar (last range))))