Merge pull request #99 from ocaml-wasm/clean-up

Clean up: remove unused or duplicated code

Author: vouillon

.github/workflows/merge.yml

@@ -0,0 +1,32 @@
+name: Daily Merge with ocsigen/js_of_ocaml
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Executes daily at midnight UTC
+  workflow_dispatch:  # Allows manual triggering of the workflow
+  push:
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout this repository
+        uses: actions/checkout@v3
+        with:
+          ref: main
+          fetch-depth: 1000
+
+      - name: Fetch js_of_ocaml master
+        run: git fetch https://github.com/ocsigen/js_of_ocaml.git master
+
+      - name: Merge js_of_ocaml master into current repository
+        run: git merge FETCH_HEAD
+
+      - name: Push merged changes to 'jsoo-merged' branch
+        run: |
+          if git show-ref --verify --quiet refs/heads/jsoo-merged; then
+            git branch -D jsoo-merged
+          fi
+          git checkout -b jsoo-merged
+          git push --force origin jsoo-merged

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