Merge branch 'master' into s3

Conflicts:

	basis/compiler/cfg/optimizer/optimizer.factor

diff --combined basis/compiler/cfg/finalization/finalization.factor
index 0000000000000000000000000000000000000000,3ee7ba06e325968bb7ef221bec9e81e2d7ca9fc6..a5f65d7c78c17e588c6d6ea378d4fc9b783e4ef6
mode 000000,100644..100644
--- /dev/null
--- 2/basis/compiler/cfg/finalization/finalization.factor
+++ b/basis/compiler/cfg/finalization/finalization.factor
@@@ -1,0 -1,15 +1,16 @@@
 -compiler.cfg.linear-scan ;
+ ! 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.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 ;

diff --combined basis/compiler/cfg/optimizer/optimizer.factor
index d43e4adcc83f3814d3884143f1a87781127d01bc,ca1886bcd6fc895b44a47301f3eb360b5d684815..ba7d31d141b87c163fb0927585b08dab5f5b81de
--- 1/basis/compiler/cfg/optimizer/optimizer.factor
--- 2/basis/compiler/cfg/optimizer/optimizer.factor
+++ b/basis/compiler/cfg/optimizer/optimizer.factor
@@@ -1,45 -1,31 +1,33 @@@
- ! Copyright (C) 2008, 2009 Slava Pestov.
+ ! Copyright (C) 2008, 2010 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: kernel sequences accessors combinators namespaces
- compiler.cfg.tco
+ USING: compiler.cfg.tco
  compiler.cfg.useless-conditionals
  compiler.cfg.branch-splitting
  compiler.cfg.block-joining
 +compiler.cfg.height
  compiler.cfg.ssa.construction
  compiler.cfg.alias-analysis
  compiler.cfg.value-numbering
  compiler.cfg.copy-prop
  compiler.cfg.dce
  compiler.cfg.write-barrier
- compiler.cfg.scheduling
  compiler.cfg.representations
+ compiler.cfg.gc-checks
+ compiler.cfg.save-contexts
  compiler.cfg.ssa.destruction
  compiler.cfg.empty-blocks
  compiler.cfg.checker ;
  IN: compiler.cfg.optimizer
  
- SYMBOL: check-optimizer?
- 
- : ?check ( cfg -- cfg' )
-     check-optimizer? get [
-         dup check-cfg
-     ] when ;
- 
  : optimize-cfg ( cfg -- cfg' )
      optimize-tail-calls
      delete-useless-conditionals
      split-branches
      join-blocks
 +    normalize-height
      construct-ssa
      alias-analysis
      value-numbering
      copy-propagation
      eliminate-dead-code
-     eliminate-write-barriers
-     select-representations
-     schedule-instructions
-     destruct-ssa
-     delete-empty-blocks
-     ?check ;
+     eliminate-write-barriers ;