Update of /cvsroot/sbcl/sbcl/src/compiler
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6632/src/compiler
Modified Files:
ir1tran.lisp locall.lisp main.lisp
Log Message:
1.0.2.26: replace *all-components* special with a local variable
* Was used only in COMPILE-TOPLEVEL where it was also bound.
Index: ir1tran.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ir1tran.lisp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- ir1tran.lisp 6 Feb 2007 05:06:38 -0000 1.146
+++ ir1tran.lisp 19 Feb 2007 11:55:52 -0000 1.147
@@ -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
Index: locall.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/locall.lisp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- locall.lisp 6 Feb 2007 05:06:38 -0000 1.77
+++ locall.lisp 19 Feb 2007 11:55:53 -0000 1.78
@@ -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))))
Index: main.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/main.lisp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- main.lisp 6 Feb 2007 05:06:38 -0000 1.121
+++ main.lisp 19 Feb 2007 11:55:53 -0000 1.122
@@ -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)
|