minor changes after merge

Author: riaqn

driver/main_args.ml

@@ -966,6 +966,9 @@ let mk_afl_inst_ratio f =
   \     (advanced, see afl-fuzz docs for AFL_INST_RATIO)"
 ;;
 
+let mk_alloc_check f =
+  "-alloc-check", Arg.Unit f, "<ignored>"
+
 let mk__ f =
   "-", Arg.String f,
   "<file>  Treat <file> as a file name (even if it starts with `-')"
@@ -1201,6 +1204,7 @@ module type Optcomp_options = sig
   val _save_ir_after : string -> unit
   val _probes : unit -> unit
   val _no_probes : unit -> unit
+  val _alloc_check : unit -> unit
 end;;
 
 module type Opttop_options = sig
@@ -1578,6 +1582,7 @@ struct
     mk_dump_into_file F._dump_into_file;
     mk_dump_dir F._dump_dir;
     mk_dump_pass F._dump_pass;
+    mk_alloc_check F._alloc_check;
 
     mk_args F._args;
     mk_args0 F._args0;
@@ -2069,6 +2074,7 @@ module Default = struct
     let _v () = Compenv.print_version_and_library "native-code compiler"
     let _no_probes = clear probes
     let _probes = set probes
+    let _alloc_check () = ()
   end
 
   module Odoc_args = struct

driver/main_args.mli

@@ -246,6 +246,7 @@ module type Optcomp_options = sig
   val _save_ir_after : string -> unit
   val _probes : unit -> unit
   val _no_probes : unit -> unit
+  val _alloc_check : unit -> unit
 end;;
 
 module type Opttop_options = sig

dune

@@ -25,7 +25,7 @@
    ;; CR gyorsh: it is not clear what the ":standard" flags are, and they
    ;; may change depending on the version of dune.
    ;; Consider hard-coded flags, such as -O3.
-   (:standard -alloc-check -caml-apply-inline-fast-path)))
+   (:standard -alloc-check)))
  (boot
   (flags
    (:standard -warn-error +A))))

toplevel/native/dune

@@ -12,31 +12,31 @@
 ;*                                                                        *
 ;**************************************************************************
 
-; (copy_files# ../*.ml*)
-; 
-; (library
-;  (name ocamltoplevel_native)
-;  (wrapped false)
-;  (modes native)
-;  (flags (:standard -principal))
-;  (libraries ocamlcommon ocamloptcomp dynlink_internal)
-;  (modules :standard \ topstart expunge))
-; 
-; (executable
-;  (name topstart)
-;  (modes native)
-;  (flags (:standard -principal))
-;  (modules topstart)
-;  (libraries ocamltoplevel_native))
-; 
-; (install
-;   (files
-;     (topstart.exe as ocamlnat)
-;   )
-;   (section bin)
-;   (package ocaml))
-; 
-; 
+(copy_files# ../*.ml*)
+
+(library
+ (name ocamltoplevel_native)
+ (wrapped false)
+ (modes native)
+ (flags (:standard -principal))
+ (libraries ocamlcommon ocamloptcomp dynlink_internal)
+ (modules :standard \ topstart expunge))
+
+(executable
+ (name topstart)
+ (modes native)
+ (flags (:standard -principal))
+ (modules topstart)
+ (libraries ocamltoplevel_native))
+
+(install
+  (files
+    (topstart.exe as ocamlnat)
+  )
+  (section bin)
+  (package ocaml))
+
+;
 ; (install
 ;   (files
 ;     (ocamltoplevel.cma as compiler-libs/ocamltoplevel.cma)
@@ -63,4 +63,4 @@
 ;   )
 ;   (section lib)
 ;   (package ocaml))
-; 
+;