master: Don't break M-. by manipulating *features* at compile-time, actually

stassats via Sbcl-commits <[email protected]> Sat, 01 Aug 2026 04:19:10 +0000
Newsgroups gmane.lisp.steel-bank.cvs
Message-ID <[email protected]>
The branch "master" has been updated in SBCL:
       via  8619c09be14724c810e232315bc503a1d7f409e6 (commit)
      from  a7547672be29b78c8f8299324ed7d6b0870678f9 (commit)

- Log -----------------------------------------------------------------
commit 8619c09be14724c810e232315bc503a1d7f409e6
Author: Stas Boukarev <[email protected]>
Date:   Sat Aug 1 07:16:54 2026 +0300

    Don't break M-. by manipulating *features* at compile-time, actually
---
 src/cold/base-target-features.lisp-expr | 3 ++-
 src/compiler/constraint.lisp            | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cold/base-target-features.lisp-expr b/src/cold/base-target-features.lisp-expr
index ed1de3fd2..11e0b5940 100644
--- a/src/cold/base-target-features.lisp-expr
+++ b/src/cold/base-target-features.lisp-expr
@@ -399,4 +399,5 @@
  ;;   :sunos      = We're intended to run under Solaris user environment
  ;;                 with the SunOS kernel.
  ;;   :win32      = We're intended to under some version of Microsoft Windows.
- )
+
+ :bitmapped-conset)
diff --git a/src/compiler/constraint.lisp b/src/compiler/constraint.lisp
index c3e02b9ca..492ea442b 100644
--- a/src/compiler/constraint.lisp
+++ b/src/compiler/constraint.lisp
@@ -133,7 +133,7 @@
 ;;; for constraint propagation, or if bit-vectors on some XC host
 ;;; really lose compared to SSETs, here's the conset API as a wrapper
 ;;; around SSETs:
-#+conset-is-sset
+#-bitmapped-conset
 (progn
   (deftype conset () 'sset)
   (declaim (ftype (sfunction (conset) boolean) conset-empty))
@@ -183,7 +183,7 @@
 ;;;    9     66   1.4    210   4.4   3857  81.0        -  (FLET SB-C::BODY-FUN :IN SB-C::TYPE-FROM-CONSTRAINTS)
 ;;;   10     58   1.2    123   2.6   3915  82.2        -  SB-KERNEL::%TYPE-INTERSECTION
 
-#-conset-is-sset
+#+bitmapped-conset
 (locally
     ;; This is performance critical for the compiler, and benefits
     ;; from the following declarations.  Probably you'll want to

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL