Raymond Toy pushed to branch master at cmucl / cmucl Commits: e31f4716 by Raymond Toy at 2024-07-20T02:07:48+00:00 Address #336: get-nil-indexed-object returns object and validp value - - - - - 75ddf400 by Raymond Toy at 2024-07-20T02:07:54+00:00 Merge branch 'issue-336-2-fix-compiler-notes' into 'master' Address #336: get-nil-indexed-object returns object and validp value See merge request cmucl/cmucl!235 - - - - - 1 changed file: - src/compiler/disassem.lisp Changes: ===================================== src/compiler/disassem.lisp ===================================== @@ -3609,7 +3609,12 @@ symbol object that we know about.") (defun get-nil-indexed-object (byte-offset) "Returns the lisp object located BYTE-OFFSET from NIL." (declare (type offset byte-offset)) - (kernel:make-lisp-obj (+ nil-addr byte-offset))) + (values (kernel:make-lisp-obj (+ nil-addr byte-offset)) + ;; Assume NIL indexed objects only come from the static + ;; space, so the byte offset must be in the static space + (<= 0 byte-offset + (- (* lisp::*static-space-free-pointer* vm:word-bytes) + (lisp::static-space-start))))) (defun get-code-constant (byte-offset dstate) "Returns two values; the lisp-object located at BYTE-OFFSET in the constant @@ -3787,11 +3792,13 @@ symbol object that we know about.") disassembled. Returns non-NIL iff a note was recorded." (declare (type offset nil-byte-offset) (type disassem-state dstate)) - (let ((obj (get-nil-indexed-object nil-byte-offset))) - (note #'(lambda (stream) - (prin1-quoted-short obj stream)) - dstate) - t)) + (multiple-value-bind (obj validp) + (get-nil-indexed-object nil-byte-offset) + (when validp + (note #'(lambda (stream) + (prin1-quoted-short obj stream)) + dstate)) + validp)) (defun maybe-note-assembler-routine (address note-address-p dstate) "If ADDRESS is the address of a primitive assembler routine or View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b7b29443aac68dad6a0fc10... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b7b29443aac68dad6a0fc10... You're receiving this email because of your account on gitlab.common-lisp.net.