projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.12.31: fix READ-SEQUENCE regression from 1.0.12.22
[sbcl.git]
/
src
/
pcl
/
wrapper.lisp
diff --git
a/src/pcl/wrapper.lisp
b/src/pcl/wrapper.lisp
index
1e8b2f8
..
eb567cd
100644
(file)
--- a/
src/pcl/wrapper.lisp
+++ b/
src/pcl/wrapper.lisp
@@
-152,6
+152,9
@@
(remhash owrapper *previous-nwrappers*)
(setf (gethash nwrapper *previous-nwrappers*) new-previous)))
(remhash owrapper *previous-nwrappers*)
(setf (gethash nwrapper *previous-nwrappers*) new-previous)))
+;;; FIXME: This is not a good name: part of the constract here is that
+;;; we return the valid wrapper, which is not obvious from the name
+;;; (or the names of our callees.)
(defun check-wrapper-validity (instance)
(let* ((owrapper (wrapper-of instance))
(state (layout-invalid owrapper)))
(defun check-wrapper-validity (instance)
(let* ((owrapper (wrapper-of instance))
(state (layout-invalid owrapper)))
@@
-187,6
+190,12
@@
(defun check-obsolete-instance (instance)
(when (invalid-wrapper-p (layout-of instance))
(check-wrapper-validity instance)))
(defun check-obsolete-instance (instance)
(when (invalid-wrapper-p (layout-of instance))
(check-wrapper-validity instance)))
+
+(defun valid-wrapper-of (instance)
+ (let ((wrapper (wrapper-of instance)))
+ (if (invalid-wrapper-p wrapper)
+ (check-wrapper-validity instance)
+ wrapper)))
\f
;;; NIL: means nothing so far, no actual arg info has NILs in the
;;; metatype.
\f
;;; NIL: means nothing so far, no actual arg info has NILs in the
;;; metatype.