From 74ea76a3c97c5a288451c41a08d25957019ac074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Mon, 2 Mar 2015 09:29:33 +0000
Subject: [PATCH] compiler.cfg: unlikely? slot unused, lets get rid of it

---
 basis/compiler/cfg/cfg-docs.factor                    | 1 -
 basis/compiler/cfg/cfg.factor                         | 3 +--
 basis/compiler/cfg/gc-checks/gc-checks.factor         | 2 +-
 basis/compiler/cfg/linearization/linearization.factor | 4 +---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/basis/compiler/cfg/cfg-docs.factor b/basis/compiler/cfg/cfg-docs.factor
index 67e3a81254..8fd27be9df 100644
--- a/basis/compiler/cfg/cfg-docs.factor
+++ b/basis/compiler/cfg/cfg-docs.factor
@@ -10,7 +10,6 @@ HELP: basic-block
     { { $slot "successors" } { "A " { $link vector } " of basic blocks that may be executed directly after this block. Most blocks only have one successor but a block that checks where an if-condition should branch to would have two for example." } }
     { { $slot "predecessors" } { "The opposite of successors -- a " { $link vector } " of basic blocks from which the execution may have arrived into this block." } }
     { { $slot "instructions" } { "A " { $link vector } " of " { $link insn } " tuples which form the instructions of the basic block." } }
-    { { $slot "unlikely?" } { "Unused boolean slot." } }
   }
 } ;
 
diff --git a/basis/compiler/cfg/cfg.factor b/basis/compiler/cfg/cfg.factor
index 8cb56f5639..6628ce0aae 100644
--- a/basis/compiler/cfg/cfg.factor
+++ b/basis/compiler/cfg/cfg.factor
@@ -9,8 +9,7 @@ number
 { instructions vector }
 { successors vector }
 { predecessors vector }
-{ kill-block? boolean }
-{ unlikely? boolean } ;
+{ kill-block? boolean } ;
 
 : <basic-block> ( -- bb )
     basic-block new
diff --git a/basis/compiler/cfg/gc-checks/gc-checks.factor b/basis/compiler/cfg/gc-checks/gc-checks.factor
index 4835087898..280678c388 100644
--- a/basis/compiler/cfg/gc-checks/gc-checks.factor
+++ b/basis/compiler/cfg/gc-checks/gc-checks.factor
@@ -77,7 +77,7 @@ M: ##box-displaced-alien allocation-size* drop 5 cells ;
 : <gc-call> ( -- bb )
     <basic-block>
     [ <gc-map> ##call-gc, ##branch, ] V{ } make
-    >>instructions t >>unlikely? ;
+    >>instructions ;
 
 :: connect-gc-checks ( bbs -- )
     ! Every basic block but the last has two successors:
diff --git a/basis/compiler/cfg/linearization/linearization.factor b/basis/compiler/cfg/linearization/linearization.factor
index f8dcd831bd..c1b60a5017 100644
--- a/basis/compiler/cfg/linearization/linearization.factor
+++ b/basis/compiler/cfg/linearization/linearization.factor
@@ -67,9 +67,7 @@ SYMBOLS: work-list loop-heads visited ;
 : (linearization-order) ( cfg -- bbs )
     init-linearization-order
 
-    [ work-list get [ process-block ] slurp-deque ] { } make
-    ! [ unlikely?>> not ] partition append
-    ;
+    [ work-list get [ process-block ] slurp-deque ] { } make ;
 
 PRIVATE>