From: Daniel Ehrenberg <littledan@pool-224-36.res.carleton.edu>
Date: Mon, 3 May 2010 22:19:28 +0000 (-0500)
Subject: Merge branch 'master' into s3
X-Git-Tag: 0.97~4715
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=5509604ffe5058200347fabab49625eef95ad30c

Merge branch 'master' into s3

Conflicts:

	basis/compiler/cfg/optimizer/optimizer.factor
---

5509604ffe5058200347fabab49625eef95ad30c
diff --cc basis/compiler/cfg/finalization/finalization.factor
index 0000000000,3ee7ba06e3..a5f65d7c78
mode 000000,100644..100644
--- a/basis/compiler/cfg/finalization/finalization.factor
+++ b/basis/compiler/cfg/finalization/finalization.factor
@@@ -1,0 -1,15 +1,16 @@@
+ ! Copyright (C) 2010 Slava Pestov.
+ ! See http://factorcode.org/license.txt for BSD license.
+ USING: compiler.cfg.empty-blocks compiler.cfg.gc-checks
+ compiler.cfg.representations compiler.cfg.save-contexts
+ compiler.cfg.ssa.destruction compiler.cfg.build-stack-frame
 -compiler.cfg.linear-scan ;
++compiler.cfg.linear-scan compiler.cfg.scheduling ;
+ IN: compiler.cfg.finalization
+ 
+ : finalize-cfg ( cfg -- cfg' )
+     select-representations
++    schedule-instructions
+     insert-gc-checks
+     insert-save-contexts
+     destruct-ssa
+     linear-scan
+     build-stack-frame ;