diff --git a/basis/compiler/cfg/cfg.factor b/basis/compiler/cfg/cfg.factor index 85c91bf413..cdfb41a4ed 100644 --- a/basis/compiler/cfg/cfg.factor +++ b/basis/compiler/cfg/cfg.factor @@ -4,22 +4,18 @@ USING: accessors kernel layouts math namespaces vectors ; IN: compiler.cfg TUPLE: basic-block < identity-tuple -{ id integer } -number -{ instructions vector } -{ successors vector } -{ predecessors vector } -{ kill-block? boolean } ; + number + { instructions vector } + { successors vector } + { predecessors vector } + { kill-block? boolean } ; : ( -- bb ) basic-block new - \ basic-block counter >>id V{ } clone >>instructions V{ } clone >>successors V{ } clone >>predecessors ; -M: basic-block hashcode* nip id>> ; - TUPLE: cfg { entry basic-block } word diff --git a/basis/compiler/cfg/intrinsics/simd/simd-tests.factor b/basis/compiler/cfg/intrinsics/simd/simd-tests.factor index 2df5a58e53..7f952284ab 100644 --- a/basis/compiler/cfg/intrinsics/simd/simd-tests.factor +++ b/basis/compiler/cfg/intrinsics/simd/simd-tests.factor @@ -50,7 +50,7 @@ IN: compiler.cfg.intrinsics.simd.tests : test-compiler-env ( -- x ) H{ } clone - T{ basic-block { id 0 } } + T{ basic-block } [ \ basic-block pick set-at ] [ 0 swap associate \ ds-heights pick set-at ] [ 0 swap associate \ rs-heights pick set-at ] tri diff --git a/basis/compiler/cfg/linearization/linearization-tests.factor b/basis/compiler/cfg/linearization/linearization-tests.factor index 0bde122dcd..6a5be04260 100644 --- a/basis/compiler/cfg/linearization/linearization-tests.factor +++ b/basis/compiler/cfg/linearization/linearization-tests.factor @@ -11,4 +11,6 @@ V{ } 2 test-bb 0 { 1 1 } edges 1 2 edge -[ t ] [ 0 get block>cfg linearization-order [ id>> ] map all-unique? ] unit-test +{ { 0 1 2 } } [ + 0 get block>cfg linearization-order [ number>> ] map +] unit-test