X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fassem.lisp;h=24dfee128698a8ace1ad70d80932663126be0af7;hb=9b1fade83db8453b75b8c7380eb12ce41b5b889c;hp=724af2fb782c8011760d36e6cfa21a5b28a06a4c;hpb=8bcffb407835ff680d5ee2ba1f7ce97839bbae3e;p=sbcl.git

diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp
index 724af2f..24dfee1 100644
--- a/src/compiler/assem.lisp
+++ b/src/compiler/assem.lisp
@@ -1179,8 +1179,8 @@
                  ;; Must be done so that contribs and user code doing
                  ;; low-level stuff don't need to worry about this.
                  (disable-package-locks %%current-segment%% %%current-vop%%))
-        (macrolet ((%%current-segment%% () '**current-segment**)
-                   (%%current-vop%% () '**current-vop**))
+        (macrolet ((%%current-segment%% () ',seg-var)
+                   (%%current-vop%% () ',vop-var))
           ;; KLUDGE: Some host lisps (CMUCL 18e Sparc at least)
           ;; can't deal with this declaration, so disable it on host.
           ;; Ditto for later ENABLE-PACKAGE-LOCKS %%C-S%% declaration.
@@ -1227,8 +1227,8 @@
                           `(,name (gen-label)))
                         new-labels))
         (declare (ignorable ,vop-var ,seg-var))
-        (macrolet ((%%current-segment%% () '**current-segment**)
-                   (%%current-vop%% () '**current-vop**))
+        (macrolet ((%%current-segment%% () ',seg-var)
+                   (%%current-vop%% () ',vop-var))
           (symbol-macrolet (,@(when (or inherited-labels nested-labels)
                                     `((..inherited-labels.. ,nested-labels))))
               ,@(mapcar (lambda (form)