move clearing of *FREE-FUNS* &co to WITH-IR1-NAMESPACE where they're bound

diff --git a/src/compiler/macros.lisp b/src/compiler/macros.lisp
index be5100e..240b617 100644 (file)
--- a/src/compiler/macros.lisp
+++ b/src/compiler/macros.lisp
@@ -692,10 +692,15 @@
          (*free-funs* (make-hash-table :test 'equal))
          (*constants* (make-hash-table :test 'equal))
          (*source-paths* (make-hash-table :test 'eq)))
-     (handler-bind ((compiler-error #'compiler-error-handler)
-                    (style-warning #'compiler-style-warning-handler)
-                    (warning #'compiler-warning-handler))
-       ,@forms)))
+     (unwind-protect
+          (handler-bind ((compiler-error #'compiler-error-handler)
+                         (style-warning #'compiler-style-warning-handler)
+                         (warning #'compiler-warning-handler))
+            ,@forms)
+       (clrhash *free-funs*)
+       (clrhash *free-vars*)
+       (clrhash *constants*)
+       (clrhash *source-paths*))))
 
 ;;; Look up NAME in the lexical environment namespace designated by
 ;;; SLOT, returning the <value, T>, or <NIL, NIL> if no entry. The

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index f063f3b..4190d37 100644 (file)
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -745,12 +745,6 @@ Examples:
 ;;; actually in use, so that this function could go away.
 (defun clear-stuff (&optional (debug-too t))
 
-  ;; Clear global tables.
-  (when (boundp '*free-funs*)
-    (clrhash *free-funs*)
-    (clrhash *free-vars*)
-    (clrhash *constants*))
-
   ;; Clear debug counters and tables.
   (clrhash *seen-blocks*)
   (clrhash *seen-funs*)