From 7044d862b9d82dc086b2ccb59dc4b372cd731b4e Mon Sep 17 00:00:00 2001 From: Alastair Bridgewater Date: Sat, 3 Apr 2010 00:40:26 +0000 Subject: [PATCH] 1.0.37.26: Remove FASL-DUMP-COLD-LOAD-FORM and its one use. * Used in one place, when doing the assembly pass over the assembly-routine source, to dump an in-package form. * Said in-package form is useless, as symbols are only ever dumped in relation to an explicit home package, not the current package. --- package-data-list.lisp-expr | 2 +- src/assembly/assemfile.lisp | 3 --- src/compiler/dump.lisp | 12 ------------ version.lisp-expr | 2 +- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 3352d07..1d66239 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -542,7 +542,7 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*." "END-CORE-ENTRY-TYPE-CODE" "FASL-CONSTANT-ALREADY-DUMPED-P" "+FASL-FILE-VERSION+" - "FASL-DUMP-COLD-LOAD-FORM" "FASL-DUMP-COMPONENT" + "FASL-DUMP-COMPONENT" "FASL-DUMP-COLD-FSET" "FASL-DUMP-LOAD-TIME-VALUE" "FASL-DUMP-LOAD-TIME-VALUE-LAMBDA" "FASL-DUMP-SOURCE-INFO" "FASL-DUMP-TOPLEVEL-LAMBDA-CALL" diff --git a/src/assembly/assemfile.lisp b/src/assembly/assemfile.lisp index 837b239..0e54b8c 100644 --- a/src/assembly/assemfile.lisp +++ b/src/assembly/assemfile.lisp @@ -45,9 +45,6 @@ (let ((*features* (cons :sb-assembling *features*))) (init-assembler) (load (merge-pathnames name (make-pathname :type "lisp"))) - (fasl-dump-cold-load-form `(in-package ,(package-name - (sane-package))) - lap-fasl-output) (sb!assem:append-segment *code-segment* *elsewhere*) (setf *elsewhere* nil) (let ((length (sb!assem:finalize-segment *code-segment*))) diff --git a/src/compiler/dump.lisp b/src/compiler/dump.lisp index 55b48a1..52bddb4 100644 --- a/src/compiler/dump.lisp +++ b/src/compiler/dump.lisp @@ -260,18 +260,6 @@ (aver (not (gethash x circ))) (setf (gethash x circ) x))) (values)) - -;;; Dump FORM to a fasl file so that it evaluated at load time in normal -;;; load and at cold-load time in cold load. This is used to dump package -;;; frobbing forms. -(defun fasl-dump-cold-load-form (form fasl-output) - (declare (type fasl-output fasl-output)) - (dump-fop 'fop-normal-load fasl-output) - (let ((*cold-load-dump* t)) - (dump-object form fasl-output)) - (dump-fop 'fop-eval-for-effect fasl-output) - (dump-fop 'fop-maybe-cold-load fasl-output) - (values)) ;;;; opening and closing fasl files diff --git a/version.lisp-expr b/version.lisp-expr index 7760b0a..20cd3fd 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.37.25" +"1.0.37.26" -- 1.7.10.4