From 4d8b3b1da4d960a6ff768c9e6ee8f99bf270b631 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Mon, 19 Feb 2007 11:55:51 +0000 Subject: [PATCH] 1.0.2.26: replace *all-components* special with a local variable * Was used only in COMPILE-TOPLEVEL where it was also bound. --- contrib/sb-posix/interface.lisp | 2 +- doc/internals-notes/threading-specials | 1 - src/compiler/ir1tran.lisp | 3 ++- src/compiler/locall.lisp | 3 +-- src/compiler/main.lisp | 19 +++++++------------ version.lisp-expr | 2 +- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/contrib/sb-posix/interface.lisp b/contrib/sb-posix/interface.lisp index 517f71f..5806754 100644 --- a/contrib/sb-posix/interface.lisp +++ b/contrib/sb-posix/interface.lisp @@ -76,7 +76,7 @@ ;;; variable. (eval-when (:compile-toplevel :load-toplevel) (setf *c-functions-in-runtime* - '`(#+netbsd ,@("stat" "lstat" "fstat" "readdir" "opendir")))) + '`(#+netbsd ,@("stat" "lstat" "fstat" "readdir" "opendir")))) ;;; filesystem access diff --git a/doc/internals-notes/threading-specials b/doc/internals-notes/threading-specials index d67db3c..aea00d3 100644 --- a/doc/internals-notes/threading-specials +++ b/doc/internals-notes/threading-specials @@ -697,7 +697,6 @@ SB-C::*BLOCK-COMPILE-ARG* SB-C::*COMPILER-ERROR-PRINT-LENGTH* SB-C::*CONTINUATION-NUMBER* SB-C::*PREV-SEGMENT* -SB-C::*ALL-COMPONENTS* SB-C::*CONTROL-DELETED-BLOCK-EVENT-INFO* SB-C::*ALLOW-DEBUG-CATCH-TAG* SB-C::*ID-LABELS* diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp index 511142a..e633b96 100644 --- a/src/compiler/ir1tran.lisp +++ b/src/compiler/ir1tran.lisp @@ -827,7 +827,8 @@ (fun-lvar (make-lvar))) (ir1-convert start ctran fun-lvar `(the (or function symbol) ,fun)) (let ((combination - (ir1-convert-combination-args fun-lvar ctran next result (cdr form)))) + (ir1-convert-combination-args fun-lvar ctran next result + (cdr form)))) (when (step-form-p form) ;; Store a string representation of the form in the ;; combination node. This will let the IR2 translator know diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index ee3b1e3..bc93706 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -355,8 +355,7 @@ (loop (let ((did-something nil)) (dolist (clambda clambdas) - (let* ((component (lambda-component clambda)) - (*all-components* (list component))) + (let ((component (lambda-component clambda))) ;; The original CMU CL code seemed to implicitly assume that ;; COMPONENT is the only one here. Let's make that explicit. (aver (= 1 (length (functional-components clambda)))) diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp index c1bed35..959fd82 100644 --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -37,7 +37,6 @@ (defvar *flame-on-necessarily-undefined-function* nil) (defvar *check-consistency* nil) -(defvar *all-components*) ;;; Set to NIL to disable loop analysis for register allocation. (defvar *loop-analyze* t) @@ -1031,14 +1030,10 @@ (locall-analyze-clambdas-until-done (list fun)) - (multiple-value-bind (components-from-dfo top-components hairy-top) - (find-initial-dfo (list fun)) - (declare (ignore hairy-top)) - - (let ((*all-components* (append components-from-dfo top-components))) - (dolist (component-from-dfo components-from-dfo) - (compile-component component-from-dfo) - (replace-toplevel-xeps component-from-dfo))) + (let ((components-from-dfo (find-initial-dfo (list fun)))) + (dolist (component-from-dfo components-from-dfo) + (compile-component component-from-dfo) + (replace-toplevel-xeps component-from-dfo)) (let ((entry-table (etypecase *compile-object* (fasl-output (fasl-output-entry-table @@ -1390,10 +1385,10 @@ (maybe-mumble "IDFO ") (multiple-value-bind (components top-components hairy-top) (find-initial-dfo lambdas) - (let ((*all-components* (append components top-components))) + (let ((all-components (append components top-components))) (when *check-consistency* (maybe-mumble "[check]~%") - (check-ir1-consistency *all-components*)) + (check-ir1-consistency all-components)) (dolist (component (append hairy-top top-components)) (pre-physenv-analyze-toplevel component)) @@ -1404,7 +1399,7 @@ (when *check-consistency* (maybe-mumble "[check]~%") - (check-ir1-consistency *all-components*)) + (check-ir1-consistency all-components)) (if load-time-value-p (compile-load-time-value-lambda lambdas) diff --git a/version.lisp-expr b/version.lisp-expr index 6ad040e..f245f1b 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.2.25" +"1.0.2.26" -- 1.7.10.4