[movitz-cvs] CVS movitz

[ffjeld]

Update of /project/movitz/cvsroot/movitz
In directory clnet:/tmp/cvs-serv21413

Modified Files:
	compiler.lisp 
Log Message:
Have optimize-code do layout-program even when *compiler-do-optimize*
is false.


--- /project/movitz/cvsroot/movitz/compiler.lisp	2007/03/01 17:50:52	1.180
+++ /project/movitz/cvsroot/movitz/compiler.lisp	2007/03/01 21:27:39	1.181
@@ -8,7 +8,7 @@
 ;;;; Created at:    Wed Oct 25 12:30:49 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: compiler.lisp,v 1.180 2007/03/01 17:50:52 ffjeld Exp $
+;;;; $Id: compiler.lisp,v 1.181 2007/03/01 21:27:39 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -1370,11 +1370,11 @@
 (defun optimize-code (unoptimized-code &rest args)
   #+ignore (print-code 'to-optimize unoptimized-code)
   (if (not *compiler-do-optimize*)
-      unoptimized-code
-    (apply #'optimize-code-internal
-	   (optimize-code-dirties
-	    (layout-program (optimize-code-unfold-branches unoptimized-code)))
-	   0 args)))
+      (layout-program (optimize-code-unfold-branches unoptimized-code))
+      (apply #'optimize-code-internal
+             (optimize-code-dirties
+              (layout-program (optimize-code-unfold-branches unoptimized-code)))
+             0 args)))
 
 (defun optimize-code-unfold-branches (unoptimized-code)
   "This particular optimization should be done before code layout:
@@ -1472,7 +1472,7 @@
 
 (defun optimize-code-internal (unoptimized-code recursive-count &rest key-args
 			       &key keep-labels stack-frame-size)
-  "Peephole optimizer. Based on a lot of rather random techniques."
+  "Peephole optimizer. Based on a lot of rather random heuristics."
   (declare (ignore stack-frame-size))
   (when (<= 20 recursive-count)
     (error "Peephole-optimizer recursive count reached ~D.