Put locs in Parse_bytecode

ocaml-wasm · Oct 9, 2024 · a0fcac8 · a0fcac8
1 parent a8c4b4d
commit a0fcac8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/compiler/lib/generate.ml b/compiler/lib/generate.ml
@@ -1102,15 +1102,7 @@ let rec translate_expr ctx queue loc x e level : _ * J.statement_list =
       let clo = compile_closure ctx cont in
       let clo =
         match clo with
-        | (st, x) :: rem ->
-            let loc =
-              match x, source_location_ctx ctx (Before pc) with
-              | (J.U | J.N), (J.U | J.N) -> J.U
-              | x, (J.U | J.N) -> x
-              | (J.U | J.N), x -> x
-              | _, x -> x
-            in
-            (st, loc) :: rem
+        | (st, J.N) :: rem -> (st, J.U) :: rem
         | _ -> clo
       in
       let clo =

diff --git a/compiler/lib/parse_bytecode.ml b/compiler/lib/parse_bytecode.ml
@@ -1303,8 +1303,19 @@ and compile infos pc state instrs =
         compile_block infos.blocks infos.debug code addr state';
         if debug_parser () then Format.printf "}@.";
         let args = State.stack_vars state' in
-        let state'', _, _ = Addr.Map.find addr !compiled_blocks in
-        Debug.propagate (State.stack_vars state'') args;
+        (let state'', instrs, last = Addr.Map.find addr !compiled_blocks in
+         Debug.propagate (State.stack_vars state'') args;
+         if Debug.mem infos.debug pc
+         then
+           let loc = Code.Before pc in
+           match instrs, last with
+           | (i, No) :: rem, _ ->
+               compiled_blocks :=
+                 Addr.Map.add addr (state'', (i, loc) :: rem, last) !compiled_blocks
+           | [], (last, No) ->
+               compiled_blocks :=
+                 Addr.Map.add addr (state'', instrs, (last, loc)) !compiled_blocks
+           | (_, (Before _ | After _)) :: _, _ | [], (_, (Before _ | After _)) -> ());
         compile
           infos
           (pc + 3)