DEFTYPE, DEFSTRUCT and DEFSETF need not be treated specially by the compiler.

src/cmp/cmptop.lsp

@@ -31,10 +31,6 @@
                    ((setq fd (get fun 'T1))
                     (when *compile-print* (print-current-form))
                     (funcall fd args))
-                   ((get fun 'TOP-LEVEL-MACRO)
-                    (when *compile-print* (print-current-form))
-		    (let ((*compile-time-too* t))
-		      (t1expr (cmp-macroexpand-1 form))))
                    ((get fun 'C1) (t1ordinary form))
                    ((setq fd (macro-function fun))
                     (t1expr (cmp-expand-macro fd fun (cdr form))))
@@ -1223,12 +1219,3 @@
 (setf (get 'si::select-package 'PACKAGE-OPERATION) t)
 (setf (get 'si::%defpackage 'PACKAGE-OPERATION) t)
 
-;;; Top-level macros.
-
-(setf (get 'defstruct 'TOP-LEVEL-MACRO) t)
-(setf (get 'deftype 'TOP-LEVEL-MACRO) t)
-(setf (get 'defsetf 'TOP-LEVEL-MACRO) t)
-; Handled through t1ordinary:
-;(setf (get 'defconstant 'TOP-LEVEL-MACRO) t)
-;(setf (get 'defparameter 'TOP-LEVEL-MACRO) t)
-

src/cmp/cmputil.lsp

@@ -178,7 +178,6 @@
   (remprop symbol 't1)
   (remprop symbol 't2)
   (remprop symbol 't3)
-  (remprop symbol 'top-level-macro)
   (remprop symbol 'c1)
   (remprop symbol 'c2)
   (remprop symbol 'c1conditional)

src/lsp/predlib.lsp

@@ -21,7 +21,8 @@
 
 ;;; DEFTYPE macro.
 (defmacro deftype (name lambda-list &rest body)
-  `(progn (setf (get ',name 'DEFTYPE-FORM)
+  `(eval-when (:compile-toplevel :load-toplevel :execute)
+          (setf (get ',name 'DEFTYPE-FORM)
 	   '(DEFTYPE ,name ,lambda-list ,@body))
           (setf (get ',name 'DEFTYPE-DEFINITION)
 	   #'(LAMBDA ,lambda-list ,@body))

src/util/emacs.el

@@ -276,7 +276,6 @@
 "clos/cmpinit.lsp"
 "clos/combin.lsp"
 "clos/defclass.lsp"
-"clos/defsys.lsp"
 "clos/fixup.lsp"
 "clos/generic.lsp"
 "clos/init.lsp"