0.9.16.6: better circularity detection in fasl dumper

[sbcl.git] / src / code / target-misc.lisp

diff --git a/src/code/target-misc.lisp b/src/code/target-misc.lisp
index a641538..c636770 100644 (file)
--- a/src/code/target-misc.lisp
+++ b/src/code/target-misc.lisp
@@ -57,9 +57,9 @@
 
 (defun %closure-values (object)
   (declare (function object))
-  (coerce (loop for index from 0 below (1- (get-closure-length object))
-                collect (%closure-index-ref object index))
-          'simple-vector))
+  (loop for index from 0
+     below (- (get-closure-length object) (1- sb!vm:closure-info-offset))
+     collect (%closure-index-ref object index)))
 
 (defun %fun-lambda-list (object)
   (%simple-fun-arglist (%fun-fun object)))
@@ -129,7 +129,8 @@
 (defun machine-instance ()
   #!+sb-doc
   "Return a string giving the name of the local machine."
-  (sb!unix:unix-gethostname))
+  #!+win32 "some-random-windows-box"
+  #!-win32 (sb!unix:unix-gethostname))
 
 (defvar *machine-version*)