Consider more precisely all debug event kinds

Author: vouillon

compiler/lib/parse_bytecode.ml

@@ -952,25 +952,36 @@ and compile infos pc state instrs =
             (* Ignore allocation events (not very interesting) *)
             if debug_parser () then Format.eprintf "Ignored allocation event@.";
             instrs
-        | ( { ev_kind = Event_pseudo | Event_after _; _ }
+        | ( { ev_kind = Event_pseudo | Event_after _; ev_info = Event_return _; _ }
           , ((Let (_, (Apply _ | Prim _)), _) as i) :: rem ) ->
+            (* Event after a call. If it is followed by another event,
+               it may have been weaken to a pseudo-event but was kept
+               for stack traces *)
             if debug_parser () then Format.eprintf "Added event across call@.";
             push_event After source event (i :: push_event Before source event rem)
         | { ev_kind = Event_pseudo; ev_info = Event_function; _ }, [] ->
             (* At beginning of function *)
             if debug_parser () then Format.eprintf "Added event at function start@.";
             push_event Before source event instrs
-        | { ev_kind = Event_after _ | Event_pseudo; _ }, _ ->
-            if debug_parser () then Format.eprintf "Ignored useless event@.";
-            (* Not interesting:
-               - before a throw instruction, but we already have an event
-                 for the exception
-               - omitted else clause
-            *)
+        | { ev_kind = Event_after _ | Event_pseudo; ev_info = Event_return _; _ }, _ ->
+            if debug_parser ()
+            then
+              Format.eprintf "Ignored useless event (beginning of a block after a call)@.";
             instrs
-        | _, _ ->
+        | { ev_kind = Event_after _; ev_info = Event_other; _ }, _ ->
+            if debug_parser ()
+            then Format.eprintf "Ignored useless event (before a raise)@.";
+            (* We already have an event for the exception. The
+               compiler add these events for stack traces. *)
+            instrs
+        | { ev_kind = Event_before; ev_info = Event_other; _ }, _
+        | { ev_kind = Event_before | Event_pseudo; ev_info = Event_function; _ }, _ ->
             if debug_parser () then Format.eprintf "added event@.";
-            push_event Before source event instrs)
+            push_event Before source event instrs
+        | { ev_kind = Event_after _; ev_info = Event_function; _ }, _
+        | { ev_kind = Event_before; ev_info = Event_return _; _ }, _ ->
+            (* Nonsensical events *)
+            assert false)
   in
 
   if pc = infos.limit

compiler/tests-full/stdlib.cma.expected.js

@@ -23386,9 +23386,9 @@
        bt =  /*<<fun.ml:31:15>>*/ caml_call1(Stdlib_Printexc[12], 0),
        exn =  /*<<fun.ml:32:6>>*/ [0, Finally_raised, e];
       caml_restore_raw_backtrace(exn, bt);
-       /*<<fun.ml:32:57>>*/ throw caml_maybe_attach_backtrace(exn, 0);
+      throw caml_maybe_attach_backtrace(exn, 0);
      }
-    }
+     /*<<fun.ml:32:57>>*/ }
      /*<<fun.ml:34:2>>*/ try{
      var result =  /*<<fun.ml:34:8>>*/ caml_call1(work, 0);
     }
@@ -23397,8 +23397,8 @@
       work_exn =  /*<<?>>*/ caml_wrap_exception(work_exn$0),
       work_bt =  /*<<fun.ml:37:20>>*/ caml_call1(Stdlib_Printexc[12], 0);
       /*<<fun.ml:38:6>>*/ finally_no_exn(0);
-      /*<<fun.ml:39:6>>*/ caml_restore_raw_backtrace(work_exn, work_bt);
-      /*<<fun.ml:39:52>>*/ throw caml_maybe_attach_backtrace(work_exn, 0);
+      /*<<fun.ml:38:23>>*/ caml_restore_raw_backtrace(work_exn, work_bt);
+     throw caml_maybe_attach_backtrace(work_exn, 0);
     }
      /*<<fun.ml:35:14>>*/ finally_no_exn(0);
      /*<<fun.ml:35:31>>*/ return result;
@@ -36172,8 +36172,8 @@
     var _d_ =  /*<<effect.ml:68:11>>*/ caml_continuation_use_noexc(k);
     function _c_(e){
       /*<<effect.ml:68:41>>*/ caml_restore_raw_backtrace(e, bt);
-      /*<<effect.ml:68:75>>*/ throw caml_maybe_attach_backtrace(e, 0);
-    }
+     throw caml_maybe_attach_backtrace(e, 0);
+     /*<<effect.ml:68:75>>*/ }
      /*<<effect.ml:68:30>>*/ return jsoo_effect_not_supported() /*<<effect.ml:69:27>>*/ ;
    }
    function match_with(comp, arg, handler){
@@ -36292,9 +36292,8 @@
             (k,
              function(e){
                /*<<effect.ml:174:29>>*/ caml_restore_raw_backtrace(e, bt);
-               /*<<effect.ml:174:63>>*/ throw caml_maybe_attach_backtrace
-                     (e, 0);
-             },
+              throw caml_maybe_attach_backtrace(e, 0);
+              /*<<effect.ml:174:63>>*/ },
              v,
              handler) /*<<effect.ml:174:74>>*/ ;
    }