X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fclass.lisp;h=abe8d0e896290b00ae6403535d7383489ae728d5;hb=4f7161165647d655392713a0d95c951e4e1749ea;hp=eb35177cd76a2c9a5763dd6fb4f1d4712014c429;hpb=ef5bc526202b95f6a1bf92fe88d2fa778a827190;p=sbcl.git diff --git a/src/code/class.lisp b/src/code/class.lisp index eb35177..abe8d0e 100644 --- a/src/code/class.lisp +++ b/src/code/class.lisp @@ -84,9 +84,10 @@ ;;; Note: This bound is set somewhat less than MOST-POSITIVE-FIXNUM ;;; in order to guarantee that several hash values can be added without ;;; overflowing into a bignum. -(def!constant layout-clos-hash-max (ash sb!xc:most-positive-fixnum -3) +(def!constant layout-clos-hash-limit (1+ (ash sb!xc:most-positive-fixnum -3)) #!+sb-doc - "the inclusive upper bound on LAYOUT-CLOS-HASH values") + "the exclusive upper bound on LAYOUT-CLOS-HASH values") +(def!type layout-clos-hash () '(integer 0 #.layout-clos-hash-limit)) ;;; a list of conses, initialized by genesis ;;; @@ -113,6 +114,13 @@ ;;; type checking and garbage collection. Whenever a class is ;;; incompatibly redefined, a new layout is allocated. If two object's ;;; layouts are EQ, then they are exactly the same type. +;;; +;;; *** IMPORTANT *** +;;; +;;; If you change the slots of LAYOUT, you need to alter genesis as +;;; well, since the initialization of layout slots is hardcoded there. +;;; +;;; FIXME: ...it would be better to automate this, of course... (def!struct (layout ;; KLUDGE: A special hack keeps this from being ;; called when building code for the @@ -136,30 +144,9 @@ ;; DEF!STRUCT setup. -- WHN 19990930 #+sb-xc-host make-load-form-for-layout)) - ;; hash bits which should be set to constant pseudo-random values - ;; for use by CLOS. Sleazily accessed via %INSTANCE-REF, see - ;; LAYOUT-CLOS-HASH. - ;; - ;; FIXME: We should get our story straight on what the type of these - ;; values is. (declared INDEX here, described as <= - ;; LAYOUT-CLOS-HASH-MAX by the doc string of that constant, - ;; generated as strictly positive in RANDOM-LAYOUT-CLOS-HASH..) - ;; - ;; [ CSR notes, several years later (2005-11-30) that the value 0 is - ;; special for these hash slots, indicating that the wrapper is - ;; obsolete. ] - ;; - ;; KLUDGE: The fact that the slots here start at offset 1 is known - ;; to the LAYOUT-CLOS-HASH function and to the LAYOUT-dumping code - ;; in GENESIS. - (clos-hash-0 (random-layout-clos-hash) :type index) - (clos-hash-1 (random-layout-clos-hash) :type index) - (clos-hash-2 (random-layout-clos-hash) :type index) - (clos-hash-3 (random-layout-clos-hash) :type index) - (clos-hash-4 (random-layout-clos-hash) :type index) - (clos-hash-5 (random-layout-clos-hash) :type index) - (clos-hash-6 (random-layout-clos-hash) :type index) - (clos-hash-7 (random-layout-clos-hash) :type index) + ;; a pseudo-random hash value for use by CLOS. KLUDGE: The fact + ;; that this slot is at offset 1 is known to GENESIS. + (clos-hash (random-layout-clos-hash) :type layout-clos-hash) ;; the class that this is a layout for (classoid (missing-arg) :type classoid) ;; The value of this slot can be: @@ -205,7 +192,19 @@ ;; This slot is known to the C runtime support code. (n-untagged-slots 0 :type index) ;; Definition location - (source-location nil)) + (source-location nil) + ;; Information about slots in the class to PCL: this provides fast + ;; access to slot-definitions and locations by name, etc. + (slot-table #(nil) :type simple-vector) + ;; True IFF the layout belongs to a standand-instance or a + ;; standard-funcallable-instance -- that is, true only if the layout + ;; is really a wrapper. + ;; + ;; FIXME: If we unify wrappers and layouts this can go away, since + ;; it is only used in SB-PCL::EMIT-FETCH-WRAPPERS, which can then + ;; use INSTANCE-SLOTS-LAYOUT instead (if there is are no slot + ;; layouts, there are no slots for it to pull.) + (for-std-class-p nil :type boolean :read-only t)) (def!method print-object ((layout layout) stream) (print-unreadable-object (layout stream :type t :identity t) @@ -220,23 +219,6 @@ ;;;; support for the hash values used by CLOS when working with LAYOUTs -(def!constant layout-clos-hash-length 8) -#!-sb-fluid (declaim (inline layout-clos-hash)) -(defun layout-clos-hash (layout i) - ;; FIXME: Either this I should be declared to be `(MOD - ;; ,LAYOUT-CLOS-HASH-LENGTH), or this is used in some inner loop - ;; where we can't afford to check that kind of thing and therefore - ;; should have some insane level of optimization. (This is true both - ;; of this function and of the SETF function below.) - (declare (type layout layout) (type index i)) - ;; FIXME: LAYOUT slots should have type `(MOD ,LAYOUT-CLOS-HASH-MAX), - ;; not INDEX. - (truly-the index (%instance-ref layout (1+ i)))) -#!-sb-fluid (declaim (inline (setf layout-clos-hash))) -(defun (setf layout-clos-hash) (new-value layout i) - (declare (type layout layout) (type index new-value i)) - (setf (%instance-ref layout (1+ i)) new-value)) - ;;; a generator for random values suitable for the CLOS-HASH slots of ;;; LAYOUTs. We use our own RANDOM-STATE here because we'd like ;;; pseudo-random values to come the same way in the target even when @@ -254,7 +236,7 @@ ;; ;; an explanation is provided in Kiczales and Rodriguez, "Efficient ;; Method Dispatch in PCL", 1990. -- CSR, 2005-11-30 - (1+ (random layout-clos-hash-max + (1+ (random (1- layout-clos-hash-limit) (if (boundp '*layout-clos-hash-random-state*) *layout-clos-hash-random-state* (setf *layout-clos-hash-random-state* @@ -266,14 +248,18 @@ ;;; cross-compilability reasons (i.e. convenience of using this ;;; function in a MAKE-LOAD-FORM expression) that functionality has ;;; been split off into INIT-OR-CHECK-LAYOUT. -(declaim (ftype (function (symbol) layout) find-layout)) +(declaim (ftype (sfunction (symbol) layout) find-layout)) (defun find-layout (name) - (let ((classoid (find-classoid name nil))) - (or (and classoid (classoid-layout classoid)) - (gethash name *forward-referenced-layouts*) - (setf (gethash name *forward-referenced-layouts*) - (make-layout :classoid (or classoid - (make-undefined-classoid name))))))) + ;; This seems to be currently used only from the compiler, but make + ;; it thread-safe all the same. We need to lock *F-R-L* before doing + ;; FIND-CLASSOID in case (SETF FIND-CLASSOID) happens in parallel. + (let ((table *forward-referenced-layouts*)) + (with-locked-hash-table (table) + (let ((classoid (find-classoid name nil))) + (or (and classoid (classoid-layout classoid)) + (gethash name table) + (setf (gethash name table) + (make-layout :classoid (or classoid (make-undefined-classoid name))))))))) ;;; If LAYOUT is uninitialized, initialize it with CLASSOID, LENGTH, ;;; INHERITS, and DEPTHOID, otherwise require that it be consistent @@ -490,7 +476,7 @@ (when classoid-layout (modify-classoid classoid) (when subclasses - (dohash (subclass subclass-layout subclasses) + (dohash ((subclass subclass-layout) subclasses :locked t) (modify-classoid subclass) (when invalidate (invalidate-layout subclass-layout)))) @@ -513,7 +499,9 @@ (let* ((super (layout-classoid super-layout)) (subclasses (or (classoid-subclasses super) (setf (classoid-subclasses super) - (make-hash-table :test 'eq))))) + (make-hash-table :test 'eq + #-sb-xc-host #-sb-xc-host + :synchronized t))))) (when (and (eq (classoid-state super) :sealed) (not (gethash classoid subclasses))) (warn "unsealing sealed class ~S in order to subclass it" @@ -613,7 +601,7 @@ (when (zerop count) (push successor free-objs)))))) (cond ((endp free-objs) - (dohash (obj info obj-info) + (dohash ((obj info) obj-info) (unless (zerop (first info)) (error "Topological sort failed due to constraint on ~S." obj))) @@ -693,122 +681,203 @@ (:constructor make-classoid-cell (name &optional classoid)) (:make-load-form-fun (lambda (c) `(find-classoid-cell - ',(classoid-cell-name c)))) + ',(classoid-cell-name c) + :errorp t))) #-no-ansi-print-object (:print-object (lambda (s stream) (print-unreadable-object (s stream :type t) (prin1 (classoid-cell-name s) stream))))) ;; Name of class we expect to find. (name nil :type symbol :read-only t) - ;; Class or NIL if not yet defined. - (classoid nil :type (or classoid null))) -(defun find-classoid-cell (name) - (or (info :type :classoid name) - (setf (info :type :classoid name) - (make-classoid-cell name)))) + ;; Classoid or NIL if not yet defined. + (classoid nil :type (or classoid null)) + ;; PCL class, if any + (pcl-class nil)) + +(defvar *classoid-cells*) +(!cold-init-forms + (setq *classoid-cells* (make-hash-table :test 'eq))) + +(defun find-classoid-cell (name &key create errorp) + (let ((table *classoid-cells*) + (real-name (uncross name))) + (or (with-locked-hash-table (table) + (or (gethash real-name table) + (when create + (setf (gethash real-name table) (make-classoid-cell real-name))))) + (when errorp + (error 'simple-type-error + :datum nil + :expected-type 'class + :format-control "Class not yet defined: ~S" + :format-arguments (list name)))))) (eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute) -(defun find-classoid (name &optional (errorp t) environment) - #!+sb-doc - "Return the class with the specified NAME. If ERRORP is false, then -NIL is returned when no such class exists." - (declare (type symbol name) (ignore environment)) - (let ((res (classoid-cell-classoid (find-classoid-cell name)))) - (if (or res (not errorp)) - res - (error 'simple-type-error - :datum nil - :expected-type 'class - :format-control "class not yet defined:~% ~S" - :format-arguments (list name))))) -(defun (setf find-classoid) (new-value name) - #-sb-xc (declare (type (or null classoid) new-value)) - (cond - ((null new-value) - (ecase (info :type :kind name) - ((nil)) - (:defined) - (:primitive - (error "attempt to redefine :PRIMITIVE type: ~S" name)) - ((:forthcoming-defclass-type :instance) - (setf (info :type :kind name) nil - (info :type :classoid name) nil - (info :type :documentation name) nil - (info :type :compiler-layout name) nil)))) - (t - (ecase (info :type :kind name) - ((nil)) - (:forthcoming-defclass-type - ;; XXX Currently, nothing needs to be done in this - ;; case. Later, when PCL is integrated tighter into SBCL, this - ;; might need more work. - nil) - (:instance - ;; KLUDGE: The reason these clauses aren't directly parallel - ;; is that we need to use the internal CLASSOID structure - ;; ourselves, because we don't have CLASSes to work with until - ;; PCL is built. In the host, CLASSes have an approximately - ;; one-to-one correspondence with the target CLASSOIDs (as - ;; well as with the target CLASSes, modulo potential - ;; differences with respect to conditions). - #+sb-xc-host - (let ((old (class-of (find-classoid name))) - (new (class-of new-value))) - (unless (eq old new) - (bug "trying to change the metaclass of ~S from ~S to ~S in the ~ - cross-compiler." - name (class-name old) (class-name new)))) - #-sb-xc-host - (let ((old (classoid-of (find-classoid name))) - (new (classoid-of new-value))) - (unless (eq old new) - (warn "changing meta-class of ~S from ~S to ~S" - name (classoid-name old) (classoid-name new))))) - (:primitive - (error "illegal to redefine standard type ~S" name)) - (:defined - (warn "redefining DEFTYPE type to be a class: ~S" name) - (setf (info :type :expander name) nil))) - - (remhash name *forward-referenced-layouts*) - (%note-type-defined name) - (setf (info :type :kind name) :instance) - (setf (classoid-cell-classoid (find-classoid-cell name)) new-value) - (unless (eq (info :type :compiler-layout name) - (classoid-layout new-value)) - (setf (info :type :compiler-layout name) (classoid-layout new-value))))) - new-value) -) ; EVAL-WHEN + + ;; Return the classoid with the specified NAME. If ERRORP is false, + ;; then NIL is returned when no such class exists." + (defun find-classoid (name &optional (errorp t)) + (declare (type symbol name)) + (let ((cell (find-classoid-cell name :errorp errorp))) + (when cell (classoid-cell-classoid cell)))) + + ;; This is definitely not thread safe with itself -- but should be + ;; OK with parallel FIND-CLASSOID & FIND-LAYOUT. + (defun (setf find-classoid) (new-value name) + #-sb-xc (declare (type (or null classoid) new-value)) + (aver new-value) + (let ((table *forward-referenced-layouts*)) + (with-locked-hash-table (table) + (let ((cell (find-classoid-cell name :create t))) + (ecase (info :type :kind name) + ((nil)) + (:forthcoming-defclass-type + ;; FIXME: Currently, nothing needs to be done in this case. + ;; Later, when PCL is integrated tighter into SBCL, this + ;; might need more work. + nil) + (:instance + (aver cell) + (let ((old-value (classoid-cell-classoid cell))) + (aver old-value) + ;; KLUDGE: The reason these clauses aren't directly + ;; parallel is that we need to use the internal + ;; CLASSOID structure ourselves, because we don't + ;; have CLASSes to work with until PCL is built. In + ;; the host, CLASSes have an approximately + ;; one-to-one correspondence with the target + ;; CLASSOIDs (as well as with the target CLASSes, + ;; modulo potential differences with respect to + ;; conditions). + #+sb-xc-host + (let ((old (class-of old-value)) + (new (class-of new-value))) + (unless (eq old new) + (bug "Trying to change the metaclass of ~S from ~S to ~S in the ~ + cross-compiler." + name (class-name old) (class-name new)))) + #-sb-xc-host + (let ((old (classoid-of old-value)) + (new (classoid-of new-value))) + (unless (eq old new) + (warn "Changing meta-class of ~S from ~S to ~S." + name (classoid-name old) (classoid-name new)))))) + (:primitive + (error "Cannot redefine standard type ~S." name)) + (:defined + (warn "Redefining DEFTYPE type to be a class: ~S" name) + (setf (info :type :expander name) nil))) + + (remhash name table) + (%note-type-defined name) + ;; we need to handle things like + ;; (setf (find-class 'foo) (find-class 'integer)) + ;; and + ;; (setf (find-class 'integer) (find-class 'integer)) + (cond ((built-in-classoid-p new-value) + (setf (info :type :kind name) + (or (info :type :kind name) :defined)) + (let ((translation (built-in-classoid-translation new-value))) + (when translation + (setf (info :type :translator name) + (lambda (c) (declare (ignore c)) translation))))) + (t + (setf (info :type :kind name) :instance))) + (setf (classoid-cell-classoid cell) new-value) + (unless (eq (info :type :compiler-layout name) + (classoid-layout new-value)) + (setf (info :type :compiler-layout name) + (classoid-layout new-value)))))) + new-value) + + (defun clear-classoid (name cell) + (ecase (info :type :kind name) + ((nil)) + (:defined) + (:primitive + (error "Attempt to remove :PRIMITIVE type: ~S" name)) + ((:forthcoming-defclass-type :instance) + (when cell + ;; Note: We cannot remove the classoid cell from the table, + ;; since compiled code may refer directly to the cell, and + ;; getting a different cell for a classoid with the same name + ;; just would not do. + + ;; Remove the proper name of the classoid. + (setf (classoid-name (classoid-cell-classoid cell)) nil) + ;; Clear the cell. + (setf (classoid-cell-classoid cell) nil + (classoid-cell-pcl-class cell) nil)) + (setf (info :type :kind name) nil + (info :type :documentation name) nil + (info :type :compiler-layout name) nil))))) ;;; Called when we are about to define NAME as a class meeting some ;;; predicate (such as a meta-class type test.) The first result is ;;; always of the desired class. The second result is any existing ;;; LAYOUT for this name. +;;; +;;; Again, this should be compiler-only, but easier to make this +;;; thread-safe. (defun insured-find-classoid (name predicate constructor) (declare (type function predicate constructor)) - (let* ((old (find-classoid name nil)) - (res (if (and old (funcall predicate old)) - old - (funcall constructor :name name))) - (found (or (gethash name *forward-referenced-layouts*) - (when old (classoid-layout old))))) - (when found - (setf (layout-classoid found) res)) - (values res found))) - -;;; If the class has a proper name, return the name, otherwise return -;;; the class. -(defun classoid-proper-name (class) - #-sb-xc (declare (type classoid class)) - (let ((name (classoid-name class))) - (if (and name (eq (find-classoid name nil) class)) + (let ((table *forward-referenced-layouts*)) + (with-locked-hash-table (table) + (let* ((old (find-classoid name nil)) + (res (if (and old (funcall predicate old)) + old + (funcall constructor :name name))) + (found (or (gethash name table) + (when old (classoid-layout old))))) + (when found + (setf (layout-classoid found) res)) + (values res found))))) + +;;; If the classoid has a proper name, return the name, otherwise return +;;; the classoid. +(defun classoid-proper-name (classoid) + #-sb-xc (declare (type classoid classoid)) + (let ((name (classoid-name classoid))) + (if (and name (eq (find-classoid name nil) classoid)) name - class))) + classoid))) ;;;; CLASS type operations (!define-type-class classoid) +;;; We might be passed classoids with invalid layouts; in any pairwise +;;; class comparison, we must ensure that both are valid before +;;; proceeding. +(defun ensure-classoid-valid (classoid layout) + (aver (eq classoid (layout-classoid layout))) + (when (layout-invalid layout) + (if (typep classoid 'standard-classoid) + (let ((class (classoid-pcl-class classoid))) + (cond + ((sb!pcl:class-finalized-p class) + (sb!pcl::force-cache-flushes class)) + ((sb!pcl::class-has-a-forward-referenced-superclass-p class) + (error "Invalid, unfinalizeable class ~S (classoid ~S)." + class classoid)) + (t (sb!pcl:finalize-inheritance class)))) + (error "Don't know how to ensure validity of ~S (not ~ + a STANDARD-CLASSOID)." classoid)))) + +(defun ensure-both-classoids-valid (class1 class2) + (do ((layout1 (classoid-layout class1) (classoid-layout class1)) + (layout2 (classoid-layout class2) (classoid-layout class2)) + (i 0 (+ i 1))) + ((and (not (layout-invalid layout1)) (not (layout-invalid layout2)))) + (aver (< i 2)) + (ensure-classoid-valid class1 layout1) + (ensure-classoid-valid class2 layout2))) + +(defun update-object-layout-or-invalid (object layout) + (if (typep (classoid-of object) 'standard-classoid) + (sb!pcl::check-wrapper-validity object) + (sb!c::%layout-invalid-error object layout))) + ;;; Simple methods for TYPE= and SUBTYPEP should never be called when ;;; the two classes are equal, since there are EQ checks in those ;;; operations. @@ -818,6 +887,7 @@ NIL is returned when no such class exists." (!define-type-method (classoid :simple-subtypep) (class1 class2) (aver (not (eq class1 class2))) + (ensure-both-classoids-valid class1 class2) (let ((subclasses (classoid-subclasses class2))) (if (and subclasses (gethash class1 subclasses)) (values t t) @@ -832,7 +902,7 @@ NIL is returned when no such class exists." (o-sub (classoid-subclasses other))) (if (and s-sub o-sub) (collect ((res *empty-type* type-union)) - (dohash (subclass layout s-sub) + (dohash ((subclass layout) s-sub :locked t) (declare (ignore layout)) (when (gethash subclass o-sub) (res (specifier-type subclass)))) @@ -841,6 +911,7 @@ NIL is returned when no such class exists." (!define-type-method (classoid :simple-intersection2) (class1 class2) (declare (type classoid class1 class2)) + (ensure-both-classoids-valid class1 class2) (cond ((eq class1 class2) class1) ;; If one is a subclass of the other, then that is the @@ -899,12 +970,16 @@ NIL is returned when no such class exists." ;;;; PCL stuff -(def!struct (std-classoid (:include classoid) - (:constructor nil))) -(def!struct (standard-classoid (:include std-classoid) +;;; the CLASSOID that we use to represent type information for +;;; STANDARD-CLASS and FUNCALLABLE-STANDARD-CLASS. The type system +;;; side does not need to distinguish between STANDARD-CLASS and +;;; FUNCALLABLE-STANDARD-CLASS. +(def!struct (standard-classoid (:include classoid) (:constructor make-standard-classoid))) -(def!struct (random-pcl-classoid (:include std-classoid) - (:constructor make-random-pcl-classoid))) +;;; a metaclass for classes which aren't standardlike but will never +;;; change either. +(def!struct (static-classoid (:include classoid) + (:constructor make-static-classoid))) ;;;; built-in classes @@ -1047,7 +1122,9 @@ NIL is returned when no such class exists." :inherits (array) :prototype-form (make-array nil)) (sequence - :translation (or cons (member nil) vector)) + :translation (or cons (member nil) vector extended-sequence) + :state :read-only + :depth 2) (vector :translation vector :codes (#.sb!vm:complex-vector-widetag) :direct-superclasses (array sequence) @@ -1326,7 +1403,7 @@ NIL is returned when no such class exists." nil (mapcar #'find-classoid direct-superclasses))))) (setf (info :type :kind name) #+sb-xc-host :defined #-sb-xc-host :primitive - (classoid-cell-classoid (find-classoid-cell name)) classoid) + (classoid-cell-classoid (find-classoid-cell name :create t)) classoid) (unless trans-p (setf (info :type :builtin name) classoid)) (let* ((inherits-vector @@ -1379,11 +1456,10 @@ NIL is returned when no such class exists." (let* ((name (first x)) (inherits-list (second x)) (classoid (make-standard-classoid :name name)) - (classoid-cell (find-classoid-cell name))) + (classoid-cell (find-classoid-cell name :create t))) ;; Needed to open-code the MAP, below (declare (type list inherits-list)) (setf (classoid-cell-classoid classoid-cell) classoid - (info :type :classoid name) classoid-cell (info :type :kind name) :instance) (let ((inherits (map 'simple-vector (lambda (x) @@ -1423,8 +1499,7 @@ NIL is returned when no such class exists." (declare (type layout layout)) (setf (layout-invalid layout) t (layout-depthoid layout) -1) - (dotimes (i layout-clos-hash-length) - (setf (layout-clos-hash layout i) 0)) + (setf (layout-clos-hash layout) 0) (let ((inherits (layout-inherits layout)) (classoid (layout-classoid layout))) (modify-classoid classoid) @@ -1442,17 +1517,15 @@ NIL is returned when no such class exists." ;;; late in the build-order.lisp-expr sequence, and be put in ;;; !COLD-INIT-FORMS there? (defun !class-finalize () - (dohash (name layout *forward-referenced-layouts*) + (dohash ((name layout) *forward-referenced-layouts*) (let ((class (find-classoid name nil))) (cond ((not class) (setf (layout-classoid layout) (make-undefined-classoid name))) ((eq (classoid-layout class) layout) (remhash name *forward-referenced-layouts*)) (t - ;; FIXME: ERROR? - (warn "something strange with forward layout for ~S:~% ~S" - name - layout)))))) + (error "Something strange with forward layout for ~S:~% ~S" + name layout)))))) (!cold-init-forms #-sb-xc-host (/show0 "about to set *BUILT-IN-CLASS-CODES*")