From eee1d952e6092ec40c417785644d1527b91af77a Mon Sep 17 00:00:00 2001
From: ram <ram>
Date: Sat, 13 Mar 1993 17:27:23 +0000
Subject: [PATCH] Make funcallable-instance-p a primitive predicate.  Fix
 class-typep layout lossage.

---
 compiler/typetran.lisp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/typetran.lisp b/compiler/typetran.lisp
index f47973126..1ca78e94e 100644
--- a/compiler/typetran.lisp
+++ b/compiler/typetran.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/typetran.lisp,v 1.17 1993/03/13 14:46:31 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/typetran.lisp,v 1.18 1993/03/13 17:27:23 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -138,6 +138,7 @@
   (define-type-predicate simple-vector-p simple-vector)
   (define-type-predicate stringp string)
   (define-type-predicate %instancep instance)
+  (define-type-predicate funcallable-instance-p funcallable-instance)
   (define-type-predicate symbolp symbol)
   (define-type-predicate vectorp vector))
 
@@ -369,7 +370,7 @@
        (t
 	(once-only ((object obj))
 	  `(and (,pred ,object)
-		(class-typep (,layout ,object) ',class))))))))
+		(class-typep (,get-layout ,object) ',class))))))))
 
 
 ;;; SOURCE-TRANSFORM-STRUCTURE-TYPEP  --  Internal
-- 
GitLab