Check additional code and source map invariants

Author: vouillon

compiler/lib/code.ml

@@ -909,6 +909,12 @@ let invariant { blocks; start; _ } =
       | Array_set (_x, _y, _z) -> ()
       | Event _ -> ()
     in
+    let rec check_events l =
+      match l with
+      | (Event _, _) :: (Event _, _) :: _ -> assert false
+      | _ :: r -> check_events r
+      | [] -> ()
+    in
     let check_last (l, _loc) =
       match l with
       | Return _ -> ()
@@ -928,5 +934,6 @@ let invariant { blocks; start; _ } =
       (fun _pc block ->
         List.iter block.params ~f:define;
         List.iter block.body ~f:check_instr;
+        check_events block.body;
         check_last block.branch)
       blocks)

compiler/lib/source_map.ml

@@ -565,10 +565,24 @@ module Standard = struct
   let to_file m file = Yojson.Raw.to_file file (json m)
 
   let invariant
-      { version; file = _; sourceroot = _; names; sources_content; sources; mappings; _ }
-      =
+      { version
+      ; file = _
+      ; sourceroot = _
+      ; names
+      ; sources_content
+      ; sources
+      ; mappings
+      ; ignore_list
+      } =
     if not (version_is_valid version)
     then invalid_arg "Source_map.Standard.invariant: invalid version";
+    (if not (List.is_empty ignore_list)
+     then
+       let s = StringSet.of_list sources in
+       if List.exists ~f:(fun nm -> not (StringSet.mem nm s)) ignore_list
+       then
+         invalid_arg
+           "Source_map.Standard.invariant: ignore list should be a subset of sources");
     match sources_content with
     | None -> ()
     | Some x ->