master: sb-x86-64-asm::maybe-note-static-lispobj: use prin1 consistently

stassats via Sbcl-commits <[email protected]> Mon, 04 May 2026 06:16:10 +0000
Newsgroups gmane.lisp.steel-bank.cvs
Message-ID <[email protected]>
The branch "master" has been updated in SBCL:
       via  0f4366f0eee15198c5e2c5e2d4ec06bd709d67c0 (commit)
      from  b5c57d2d40001c1d4af0c83876ba9bcd7d62af4a (commit)

- Log -----------------------------------------------------------------
commit 0f4366f0eee15198c5e2c5e2d4ec06bd709d67c0
Author: Stas Boukarev <[email protected]>
Date:   Mon May 4 09:12:46 2026 +0300

    sb-x86-64-asm::maybe-note-static-lispobj: use prin1 consistently
---
 src/compiler/x86-64/target-insts.lisp | 2 +-
 tests/x86-64-codegen.impure.lisp      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/compiler/x86-64/target-insts.lisp b/src/compiler/x86-64/target-insts.lisp
index 8c1717b91..ebccfbbf5 100644
--- a/src/compiler/x86-64/target-insts.lisp
+++ b/src/compiler/x86-64/target-insts.lisp
@@ -325,7 +325,7 @@
         (return-from found thing))))) |#
   (awhen (and (typep value 'word)
               (sb-disassem::find-code-constant-from-interior-pointer value dstate))
-    (note (lambda (stream) (princ it stream)) dstate)))
+    (note (lambda (stream) (prin1 it stream)) dstate)))
 
 ;;; Return an instance of REG or MACHINE-EA.
 ;;; MOD and R/M are the extracted bits from the instruction's ModRM byte.
diff --git a/tests/x86-64-codegen.impure.lisp b/tests/x86-64-codegen.impure.lisp
index fa2aa9842..95c26b6e1 100644
--- a/tests/x86-64-codegen.impure.lisp
+++ b/tests/x86-64-codegen.impure.lisp
@@ -1355,7 +1355,7 @@
     (assert
      (loop for line in lines
            thereis (and (search "CMP DWORD PTR" line)
-                        (search "#<LAYOUT" line)
+                        (search "#<SB-KERNEL:LAYOUT" line)
                         (search "for SB-THREAD:MUTEX" line))))))
 
 (with-test (:name :dx-list-push-imm :skipped-on (not :immobile-space))
@@ -1472,6 +1472,7 @@
     (dolist (line (disassembly-lines (compile nil expr)))
       (when (search "CMP " line)
         (incf comparisons)
-        (when (and (search "#<LAYOUT" line) (search "FROZENTHING" line))
+        (when (and (search "#<SB-KERNEL:LAYOUT" line)
+                   (search "FROZENTHING" line))
           (setq saw-layout t))))
     (assert (and saw-layout (eql comparisons 1)))))

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


hooks/post-receive
-- 
SBCL