master: Undo a couple lines of prior change
snuglas via Sbcl-commits <[email protected]>
| Newsgroups | gmane.lisp.steel-bank.cvs |
|---|---|
| Message-ID | <[email protected]> |
The branch "master" has been updated in SBCL:
via e1f589db879b6862b635b15b45c79cc6466996a7 (commit)
from 976cf627663cea74fba0789689e36cfdbc3eef5a (commit)
- Log -----------------------------------------------------------------
commit e1f589db879b6862b635b15b45c79cc6466996a7
Author: Douglas Katzman <[email protected]>
Date: Wed Apr 15 18:08:14 2026 -0400
Undo a couple lines of prior change
Rev 976cf627 removed the :elide-if which I thought was reasonable, but nope.
---
src/compiler/x86-64/cell.lisp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/compiler/x86-64/cell.lisp b/src/compiler/x86-64/cell.lisp
index 94335da60..3a6805921 100644
--- a/src/compiler/x86-64/cell.lisp
+++ b/src/compiler/x86-64/cell.lisp
@@ -306,7 +306,9 @@
#-immobile-space (:temporary (:sc unsigned-reg) temp)
(:vop-var vop)
(:generator 1
- (pseudo-atomic () ; assume software card marking
+ ;; If the OBJECT is an immobile symbol, this has to pseudo-atomic. But equally importantly
+ ;; with #+permgen this MUST NOT be pseudo-atomic, because REMSET-INSERT uses pseudo-atomic.
+ (pseudo-atomic (:elide-if (or #-immobile-space t))
(gcbar)
;; I think this has :LOCK because I want the 3 lowest bits to be
;; flags which might undergo concurrent modification.
@@ -320,7 +322,7 @@
#-immobile-space (:temporary (:sc unsigned-reg) temp)
(:vop-var vop)
(:generator 1
- (pseudo-atomic () ; assume software card marking
+ (pseudo-atomic (:elide-if (or #-immobile-space t))
(gcbar)
(storew function object fdefn-fun-slot other-pointer-lowtag)
(unless (and (sc-is linkage-val immediate) (zerop (tn-value linkage-val)))
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL