compiler.cfg.dominance: fix for #1227, the dom children needs to be sorted to ensure that the same instruction sequence is generated every time

basis/compiler/cfg/dominance/dominance-tests.factor

@@ -1,6 +1,7 @@
-USING: tools.test sequences vectors namespaces kernel accessors assocs sets
+USING:  accessors arrays assocs compiler.cfg compiler.cfg.dominance
-math.ranges arrays compiler.cfg compiler.cfg.dominance compiler.cfg.debugger
+compiler.cfg.dominance.private compiler.cfg.debugger compiler.cfg.predecessors
-compiler.cfg.predecessors compiler.cfg.utilities ;
+compiler.cfg.utilities grouping kernel math.ranges namespaces sequences sets
+tools.test vectors ;
 IN: compiler.cfg.dominance.tests
 
 : test-dominance ( -- )
@@ -72,3 +73,36 @@ V{ } 5 test-bb
 [ ] [ test-dominance ] unit-test
 
 [ t ] [ 0 5 [a,b] [ get dom-parent 0 get eq? ] all? ] unit-test
+
+: non-det-test ( -- cfg )
+    {
+        { 0 { } }
+        { 1 { } }
+        { 2 { } }
+        { 3 { } }
+        { 4 { } }
+        { 5 { } }
+        { 6 { } }
+        { 7 { } }
+        { 8 { } }
+    } [ over insns>block ] assoc-map dup
+    {
+        { 0 1 }
+        { 1 2 } { 1 7 }
+        { 2 3 } { 2 5 }
+        { 3 4 }
+        { 5 6 }
+        { 7 8 }
+    } make-edges 0 of block>cfg ;
+
+: dom-childrens>numbers ( -- assoc )
+    dom-childrens get
+    [ [ number>> ] [ [ number>> ] map ] bi* ] assoc-map ;
+
+! It is essential that the same dominance map is created each time and
+! that it does not differ due to hashing irregularities.
+{ t } [
+    20 [
+        non-det-test needs-dominance dom-childrens>numbers
+    ] replicate all-equal?
+] unit-test

basis/compiler/cfg/dominance/dominance.factor

@@ -46,10 +46,9 @@ PRIVATE>
 
 <PRIVATE
 
-: compute-dom-children ( -- )
+: compute-dom-children ( dom-parents -- dom-childrens )
-    dom-parents get H{ } clone
+    H{ } clone [ '[ 2dup eq? [ 2drop ] [ _ push-at ] if ] assoc-each ] keep
-    [ '[ 2dup eq? [ 2drop ] [ _ push-at ] if ] assoc-each ] keep
+    [ [ number>> ] sort-with ] assoc-map ;
-    dom-childrens set ;
 
 SYMBOLS: preorder maxpreorder ;
 
@@ -74,7 +73,10 @@ PRIVATE>
     [ 0 ] dip entry>> (compute-dfs) drop ;
 
 : compute-dominance ( cfg -- )
-    [ compute-dom-parents compute-dom-children ] [ compute-dfs ] bi ;
+    [
+        compute-dom-parents
+        dom-parents get compute-dom-children dom-childrens set
+    ] [ compute-dfs ] bi ;
 
 PRIVATE>