From 4912011b67189a014054ff5c88cc6491ded46f6b Mon Sep 17 00:00:00 2001 From: Douglas Katzman Date: Sat, 17 Sep 2016 15:59:58 -0400 Subject: [PATCH] Kill a defvar that is just sb-vm::nil-value by another name --- src/compiler/target-disassem.lisp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp index fac352635..1cdfbfcec 100644 --- a/src/compiler/target-disassem.lisp +++ b/src/compiler/target-disassem.lisp @@ -1791,20 +1791,18 @@ (when (symbolp maybe-symbol) (return (values maybe-symbol (cdr field)))))))) -(defvar *address-of-nil-object* (sb!kernel:get-lisp-obj-address nil)) - ;;; Given a BYTE-OFFSET from NIL, try and figure out which slot of ;;; which symbol is being referred to. Of course we can just give up, ;;; so it's not a big deal... Return two values, the symbol and the ;;; access function. (defun grok-nil-indexed-symbol-slot-ref (byte-offset) (declare (type offset byte-offset)) - (grok-symbol-slot-ref (+ *address-of-nil-object* byte-offset))) + (grok-symbol-slot-ref (+ sb!vm::nil-value byte-offset))) ;;; Return the Lisp object located BYTE-OFFSET from NIL. (defun get-nil-indexed-object (byte-offset) (declare (type offset byte-offset)) - (sb!kernel:make-lisp-obj (+ *address-of-nil-object* byte-offset))) + (sb!kernel:make-lisp-obj (+ sb!vm::nil-value byte-offset))) ;;; Return two values; the Lisp object located at BYTE-OFFSET in the ;;; constant area of the code-object in the current segment and T, or -- 2.11.4.GIT