Add mlis from #172 (#186)

file_formats/cmt_format.mli

@@ -93,13 +93,7 @@ val save_cmt :
   binary_annots ->
   string option ->  (* source file *)
   Env.t -> (* initial env *)
-<<<<<<< HEAD
   Cmi_format.cmi_infos_lazy option -> (* if a .cmi was generated *)
-||||||| merged common ancestors
-  Cmi_format.cmi_infos option -> (* if a .cmi was generated *)
-=======
-  Cmi_format.cmi_infos option -> (* if a .cmi was generated *)
->>>>>>> ocaml/5.1
   Shape.t option ->
   unit
 

middle_end/clambda.mli

@@ -117,11 +117,7 @@ and ufunction = {
   body   : ulambda;
   dbg    : Debuginfo.t;
   env    : Backend_var.t option;
-<<<<<<< HEAD
   mode   : Lambda.alloc_mode;
-||||||| merged common ancestors
-=======
->>>>>>> ocaml/5.1
   poll   : poll_attribute;
 }
 
@@ -139,13 +135,8 @@ type function_description =
     mutable fun_closed: bool;           (* True if environment not used *)
     mutable fun_inline: (Backend_var.With_provenance.t list * ulambda) option;
     mutable fun_float_const_prop: bool; (* Can propagate FP consts *)
-<<<<<<< HEAD
     fun_region: bool;                   (* If false, may locally allocate
                                            in caller's region *)
-||||||| merged common ancestors
-    mutable fun_float_const_prop: bool  (* Can propagate FP consts *)
-=======
->>>>>>> ocaml/5.1
     fun_poll: poll_attribute;           (* Behaviour for polls *)
   }
 

middle_end/clambda_primitives.mli

@@ -37,17 +37,9 @@ type modify_mode = Lambda.modify_mode
 type primitive =
   | Pread_symbol of string
   (* Operations on heap blocks *)
-<<<<<<< HEAD
   | Pmakeblock of int * mutable_flag * block_shape * alloc_mode
   | Pmakeufloatblock of mutable_flag * alloc_mode
-  | Pfield of int * layout
-||||||| merged common ancestors
-  | Pmakeblock of int * mutable_flag * block_shape
-  | Pfield of int
-=======
-  | Pmakeblock of int * mutable_flag * block_shape
-  | Pfield of int * immediate_or_pointer * mutable_flag
->>>>>>> ocaml/5.1
+  | Pfield of int * layout * immediate_or_pointer * mutable_flag
   | Pfield_computed
   | Psetfield of int * immediate_or_pointer * initialization_or_assignment
   | Psetfield_computed of immediate_or_pointer * initialization_or_assignment
@@ -138,34 +130,24 @@ type primitive =
   | Pbswap16
   | Pbbswap of boxed_integer * alloc_mode
   (* Integer to external pointer *)
-<<<<<<< HEAD
   | Pint_as_pointer of alloc_mode
-||||||| merged common ancestors
-  | Pint_as_pointer
-=======
-  | Pint_as_pointer
   (* Atomic operations *)
   | Patomic_load of {immediate_or_pointer : immediate_or_pointer}
   | Patomic_exchange
   | Patomic_cas
   | Patomic_fetch_add
->>>>>>> ocaml/5.1
   (* Inhibition of optimisation *)
   | Popaque
-<<<<<<< HEAD
   (* Probes *)
   | Pprobe_is_enabled of { name : string }
   | Punbox_float
   | Pbox_float of alloc_mode
   | Punbox_int of boxed_integer
   | Pbox_int of boxed_integer * alloc_mode
   | Pget_header of alloc_mode
-||||||| merged common ancestors
-=======
   (* Fetch domain-local state *)
   | Pdls_get
 
->>>>>>> ocaml/5.1
 
 and integer_comparison = Lambda.integer_comparison =
     Ceq | Cne | Clt | Cgt | Cle | Cge

middle_end/compilenv.mli

@@ -110,14 +110,8 @@ val read_library_info: string -> library_infos
 type error =
     Not_a_unit_info of string
   | Corrupted_unit_info of string
-<<<<<<< HEAD
   | Illegal_renaming of Compilation_unit.t * Compilation_unit.t * string
-||||||| merged common ancestors
-  | Illegal_renaming of string * string * string
-=======
-  | Illegal_renaming of string * string * string
   | Mismatching_for_pack of string * string * string * string option
->>>>>>> ocaml/5.1
 
 exception Error of error