Use Js_of_ocaml_compiler.Structure instead of Wa_structure

Module Structure was basically copied from Wa_structure.

Author: vouillon

compiler/lib/generate.ml

@@ -1642,7 +1642,7 @@ and compile_block_no_loop st queue (pc : Addr.t) ~fall_through scope_stack =
         | true -> never, [ J.Labelled_statement (l, (J.Block inner, J.N)), J.N ] @ code
         | false -> never, inner @ code)
   in
-  let never_after, after = loop ~scope_stack ~fall_through (List.rev new_scopes) in
+  let never_after, after = loop ~scope_stack ~fall_through new_scopes in
   never_after, seq @ after
 
 and compile_decision_tree kind st scope_stack loc cx dtree ~fall_through =

compiler/lib/structure.ml

@@ -147,7 +147,9 @@ let is_loop_header g pc =
   Addr.Set.exists (fun pc' -> Hashtbl.find g.block_order pc' >= o) s
 
 let sort_in_post_order t l =
-  List.sort ~cmp:(fun a b -> compare (block_order t a) (block_order t b)) l
+  List.sort ~cmp:(fun a b -> compare (block_order t b) (block_order t a)) l
+
+let blocks_in_reverse_post_order g = g.reverse_post_order
 
 (*
 

compiler/lib/structure.mli

@@ -21,4 +21,6 @@ val is_loop_header : t -> Addr.t -> bool
 
 val sort_in_post_order : t -> Addr.t list -> Addr.t list
 
+val blocks_in_reverse_post_order : t -> Code.Addr.t list
+
 val get_nodes : t -> Addr.Set.t

compiler/lib/wasm/wa_generate.ml

@@ -856,15 +856,15 @@ module Generate (Target : Wa_target_sig.S) = struct
         ~pc
         ~params
     in
-    let g = Wa_structure.build_graph ctx.blocks pc in
-    let dom = Wa_structure.dominator_tree g in
+    let g = Structure.build_graph ctx.blocks pc in
+    let dom = Structure.dominator_tree g in
     let rec translate_tree result_typ fall_through pc context =
       let block = Addr.Map.find pc ctx.blocks in
       let keep_ouside pc' =
         match fst block.branch with
         | Switch _ -> true
         | Cond (_, (pc1, _), (pc2, _)) when pc' = pc1 && pc' = pc2 -> true
-        | _ -> Wa_structure.is_merge_node g pc'
+        | _ -> Structure.is_merge_node g pc'
       in
       let code ~context =
         translate_node_within
@@ -873,13 +873,13 @@ module Generate (Target : Wa_target_sig.S) = struct
           ~pc
           ~l:
             (pc
-            |> Wa_structure.get_edges dom
+            |> Structure.get_edges dom
             |> Addr.Set.elements
             |> List.filter ~f:keep_ouside
-            |> Wa_structure.sort_in_post_order g)
+            |> Structure.sort_in_post_order g)
           ~context
       in
-      if Wa_structure.is_loop_header g pc
+      if Structure.is_loop_header g pc
       then
         loop { params = []; result = result_typ } (code ~context:(`Block pc :: context))
       else code ~context
@@ -943,7 +943,7 @@ module Generate (Target : Wa_target_sig.S) = struct
                   List.filter
                     ~f:(fun pc' ->
                       Stack.stack_adjustment_needed stack_ctx ~src:pc ~dst:pc')
-                    (List.rev (Addr.Set.elements (Wa_structure.get_edges dom pc)))
+                    (List.rev (Addr.Set.elements (Structure.get_edges dom pc)))
                 in
                 let br_table e a context =
                   let len = Array.length a in
@@ -999,8 +999,8 @@ module Generate (Target : Wa_target_sig.S) = struct
       match fall_through with
       | `Block dst' when dst = dst' -> return ()
       | _ ->
-          if (src >= 0 && Wa_structure.is_backward g src dst)
-             || Wa_structure.is_merge_node g dst
+          if (src >= 0 && Structure.is_backward g src dst)
+             || Structure.is_merge_node g dst
           then instr (Br (label_index context dst, None))
           else translate_tree result_typ fall_through dst context
     in

compiler/lib/wasm/wa_globalize.ml

@@ -104,7 +104,7 @@ let traverse_block p st pc =
   List.fold_left ~f:(fun st i -> traverse_instruction st i) ~init:st b.Code.body
 
 let f p g closures =
-  let l = Wa_structure.blocks_in_reverse_post_order g in
+  let l = Structure.blocks_in_reverse_post_order g in
   let in_loop = Freevars.find_loops_in_closure p p.Code.start in
   let st =
     List.fold_left

compiler/lib/wasm/wa_globalize.mli

@@ -18,6 +18,6 @@
 
 val f :
      Code.program
-  -> Wa_structure.control_flow_graph
+  -> Structure.t
   -> Wa_closure_conversion.closure Code.Var.Map.t
   -> Code.Var.Set.t