1.0.18.2: more conservative interval artihmetic

[sbcl.git] / src / compiler / generic / genesis.lisp

diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp
index 55a0e57..843cc73 100644 (file)
--- a/src/compiler/generic/genesis.lisp
+++ b/src/compiler/generic/genesis.lisp
@@ -870,7 +870,7 @@ core and return a descriptor to it."
 (defun cold-set-layout-slot (cold-layout slot-name value)
   (write-wordindexed
    cold-layout
-   (+ sb-vm:instance-slots-offset (target-layout-index slot-name))
+   (+ sb!vm:instance-slots-offset (target-layout-index slot-name))
    value))
 
 ;;; Return a list of names created from the cold layout INHERITS data
@@ -959,6 +959,7 @@ core and return a descriptor to it."
     (cold-set-layout-slot result 'info *nil-descriptor*)
     (cold-set-layout-slot result 'pure *nil-descriptor*)
     (cold-set-layout-slot result 'n-untagged-slots nuntagged)
+    (cold-set-layout-slot result 'for-std-class-p *nil-descriptor*)
 
     (setf (gethash name *cold-layouts*)
           (list result
@@ -1107,7 +1108,8 @@ core and return a descriptor to it."
         *cl-package*
         ;; ordinary case
         (let ((result (symbol-package symbol)))
-          (aver (package-ok-for-target-symbol-p result))
+          (unless (package-ok-for-target-symbol-p result)
+            (bug "~A in bad package for target: ~A" symbol result))
           result))))
 
 ;;; Return a handle on an interned symbol. If necessary allocate the
@@ -2728,7 +2730,6 @@ core and return a descriptor to it."
                   (symbol-value c)
                   nil)
             constants))
-
     (setf constants
           (sort constants
                 (lambda (const1 const2)