Account for new flags

Author: goldfirere

src/kernel/mconfig.ml

@@ -27,7 +27,8 @@ type ocaml =
     as_parameter : bool;
     as_argument_for : string option;
     zero_alloc_check : Zero_alloc_annotations.Check.t;
-    allow_illegal_crossing : bool
+    zero_alloc_assert : Zero_alloc_annotations.Assert.t;
+    infer_with_bounds : bool
   }
 
 let dump_warnings st =
@@ -57,7 +58,9 @@ let dump_ocaml x =
       ("parameters", `List (List.map ~f:Json.string x.parameters));
       ("as_parameter", `Bool x.as_parameter);
       ( "zero_alloc_check",
-        `String (Zero_alloc_annotations.Check.to_string x.zero_alloc_check) )
+        `String (Zero_alloc_annotations.Check.to_string x.zero_alloc_check) );
+      ("zero_alloc_assert",
+        `String (Zero_alloc_annotations.Assert.to_string x.zero_alloc_assert) )
     ]
 
 (** Some paths can be resolved relative to a current working directory *)
@@ -452,7 +455,6 @@ let ocaml_ignored_flags =
     "-drawflambda";
     "-drawlambda";
     "-dreload";
-    "-dscheduling";
     "-dsel";
     "-dsource";
     "-dspill";
@@ -652,6 +654,7 @@ let ocaml_ignored_parametrized_flags =
     "-o";
     "-rounds";
     "-runtime-variant";
+    "-ocamlrunparam";
     "-unbox-closures-factor";
     "-use-prims";
     "-use_runtime";
@@ -834,10 +837,17 @@ let ocaml_flags =
             failwith ("Invalid value for -zero-alloc-check: " ^ zero_alloc_str)),
       " Check that annotated functions do not allocate and do not have \
        indirect calls. " ^ Zero_alloc_annotations.Check.doc );
-    ( "-allow-illegal-crossing",
-      Marg.unit (fun ocaml -> { ocaml with allow_illegal_crossing = true }),
-      "Type declarations will not be checked along the portability or \
-       contention axes" )
+    ( "-zero-alloc-assert",
+      Marg.param "string" (fun zero_alloc_str ocaml ->
+         match Zero_alloc_annotations.Assert.of_string zero_alloc_str with
+          | Some zero_alloc_assert -> { ocaml with zero_alloc_assert }
+          | None ->
+            failwith ("Invalid value for -zero-alloc-assert: " ^ zero_alloc_str)),
+      " Add zero_alloc annotations to all functions. " ^
+      Zero_alloc_annotations.Assert.doc );
+    ( "-infer-with-bounds",
+      Marg.unit (fun ocaml -> { ocaml with infer_with_bounds = true }),
+      "Infer with-bounds on kinds for type declarations. May impact performance." )
   ]
 
 (** {1 Main configuration} *)
@@ -866,7 +876,8 @@ let initial =
         as_parameter = false;
         as_argument_for = None;
         zero_alloc_check = Zero_alloc_annotations.Check.Check_default;
-        allow_illegal_crossing = false
+        zero_alloc_assert = Zero_alloc_annotations.Assert.Assert_default;
+        infer_with_bounds = false
       };
     merlin =
       { build_path = [];

src/kernel/mconfig.mli

@@ -25,7 +25,8 @@ type ocaml =
     as_parameter : bool;
     as_argument_for : string option;
     zero_alloc_check : Zero_alloc_annotations.Check.t;
-    allow_illegal_crossing : bool
+    zero_alloc_assert : Zero_alloc_annotations.Assert.t;
+    infer_with_bounds : bool
   }
 
 val dump_ocaml : ocaml -> json